[CalendarServer-changes] [3287] CalendarServer/trunk/bin/caladmin
source_changes at macosforge.org
source_changes at macosforge.org
Thu Oct 30 15:39:25 PDT 2008
Revision: 3287
http://trac.macosforge.org/projects/calendarserver/changeset/3287
Author: wsanchez at apple.com
Date: 2008-10-30 15:39:24 -0700 (Thu, 30 Oct 2008)
Log Message:
-----------
Make caladmin as cool as caldav_export
Modified Paths:
--------------
CalendarServer/trunk/bin/caladmin
Modified: CalendarServer/trunk/bin/caladmin
===================================================================
--- CalendarServer/trunk/bin/caladmin 2008-10-30 22:37:46 UTC (rev 3286)
+++ CalendarServer/trunk/bin/caladmin 2008-10-30 22:39:24 UTC (rev 3287)
@@ -19,9 +19,21 @@
#PYTHONPATH
-if __name__ == '__main__':
- if 'PYTHONPATH' in globals():
+if __name__ == "__main__":
+ if "PYTHONPATH" in globals():
sys.path.insert(0, PYTHONPATH)
+ else:
+ from os.path import dirname, abspath, join
+ from subprocess import Popen, PIPE
- from twistedcaldav.admin.script import run
- run()
+ home = dirname(dirname(abspath(__file__)))
+ run = join(home, "run")
+
+ child = Popen((run, "-p"), stdout=PIPE)
+ path, stderr = child.communicate()
+
+ if child.wait() == 0:
+ sys.path[0:0] = path.split(":")
+
+ from twistedcaldav.admin.script import run
+ main()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081030/0fe7a1bb/attachment.html>
More information about the calendarserver-changes
mailing list