[CalendarServer-changes] [2028] CalendarServer/trunk/setup.py

[source_changes at macosforge.org]

Revision: 2028
          http://trac.macosforge.org/projects/calendarserver/changeset/2028
Author:   wsanchez at apple.com
Date:     2007-11-29 10:45:40 -0800 (Thu, 29 Nov 2007)

Log Message:
-----------
Fix up version logic

Modified Paths:
--------------
    CalendarServer/trunk/setup.py

Modified: CalendarServer/trunk/setup.py
===================================================================
--- CalendarServer/trunk/setup.py	2007-11-29 18:44:59 UTC (rev 2027)
+++ CalendarServer/trunk/setup.py	2007-11-29 18:45:40 UTC (rev 2028)
@@ -34,10 +34,10 @@
 )
 
 for branch in branches:
-    svnversion = os.popen("svnversion -n %r %s" % (os.path.dirname(__file__), branch))
+    cmd = "svnversion -n %r %s" % (os.path.dirname(__file__), branch)
+    svnversion = os.popen(cmd)
     svn_revision = svnversion.read()
     svnversion.close()
-    svn_revision = "exported" ######################################
 
     if "S" in svn_revision:
         continue
@@ -53,7 +53,9 @@
             if __file__.startswith(os.path.sep):
                 project_name = os.path.basename(os.path.dirname(__file__))
             else:
-                os.chdir(os.path.dirname(__file__))
+                wd = os.path.dirname(__file__)
+                if wd:
+                    os.chdir(wd)
                 project_name = os.path.basename(os.getcwd())
 
             prefix = "CalendarServer-"
@@ -68,7 +70,7 @@
 
     break
 else:
-    version = "unknown (base_version :: %s)" % (base_version, svn_revision)
+    version = "unknown (%s :: %s)" % (base_version, svn_revision)
 
 #
 # Options

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20071129/30d1b12c/attachment.html