[CalendarServer-changes] [5100] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 5100
          http://trac.macosforge.org/projects/calendarserver/changeset/5100
Author:   cdaboo at apple.com
Date:     2010-02-12 13:24:12 -0800 (Fri, 12 Feb 2010)
Log Message:
-----------
Better postgres management.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/managepostgres.py

Added Paths:
-----------
    CalendarServer/trunk/bin/calendarserver_manage_postgres

Added: CalendarServer/trunk/bin/calendarserver_manage_postgres
===================================================================
--- CalendarServer/trunk/bin/calendarserver_manage_postgres	                        (rev 0)
+++ CalendarServer/trunk/bin/calendarserver_manage_postgres	2010-02-12 21:24:12 UTC (rev 5100)
@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+##
+# Copyright (c) 2010 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+import sys
+
+#PYTHONPATH
+
+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
+
+        home = dirname(dirname(abspath(__file__)))
+        run = join(home, "run")
+
+        child = Popen((run, "-p"), stdout=PIPE)
+        path, _ignore_stderr = child.communicate()
+
+        path = path.rstrip("\n")
+
+        if child.wait() == 0:
+            sys.path[0:0] = path.split(":")
+
+    from calendarserver.tools.managepostgres import main
+    main()


Property changes on: CalendarServer/trunk/bin/calendarserver_manage_postgres
___________________________________________________________________
Added: svn:executable
   + *

Modified: CalendarServer/trunk/calendarserver/tools/managepostgres.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/managepostgres.py	2010-02-12 18:37:52 UTC (rev 5099)
+++ CalendarServer/trunk/calendarserver/tools/managepostgres.py	2010-02-12 21:24:12 UTC (rev 5100)
@@ -69,9 +69,9 @@
 
 def doClean(basedir):
     
-    cmd("rm -rf %s/data" % (basedir, basedir,))
+    cmd("rm -rf %s/data" % (basedir,))
 
-if __name__ == '__main__':
+def main():
 
     usage = "%prog [options] ACTION"
     epilog = """
@@ -93,7 +93,7 @@
     parser.add_option("-v", "--verbose", action="store_true", dest="verbose",
                       default=True, help="Use debug logging for PostgreSQL")
     parser.add_option("-d", "--base-dir", dest="basedir",
-                      default="%s/../postgresql-8.4.1/_root" % (os.getcwd(),), help="Base directory for PostgreSQL install")
+                      default="%s/../postgresql-8.4.2/_root" % (os.getcwd(),), help="Base directory for PostgreSQL install")
 
     (options, args) = parser.parse_args()
 
@@ -112,3 +112,6 @@
         doClean(options.basedir)
     else:
         parser.error("incorrect argument '%s'" % (args[0],))
+
+if __name__ == '__main__':
+    main()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100212/8c45de5d/attachment-0001.html>