[CalendarServer-changes] [14753] CalendarServer/branches/users/sagen/request-socket/setup.py

[source_changes at macosforge.org]

Revision: 14753
          http://trac.calendarserver.org//changeset/14753
Author:   sagen at apple.com
Date:     2015-05-05 08:56:26 -0700 (Tue, 05 May 2015)
Log Message:
-----------
Tweak the version string for branches

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/request-socket/setup.py

Modified: CalendarServer/branches/users/sagen/request-socket/setup.py
===================================================================
--- CalendarServer/branches/users/sagen/request-socket/setup.py	2015-05-05 14:31:00 UTC (rev 14752)
+++ CalendarServer/branches/users/sagen/request-socket/setup.py	2015-05-05 15:56:26 UTC (rev 14753)
@@ -78,7 +78,7 @@
         location = url.text[len(root.text):]
     else:
         location = url.text
-    project, branch = location.strip("/").split("/")
+    project, branch = location.strip("/").split("/", 1)
 
     return dict(
         root=root.text,
@@ -180,10 +180,10 @@
         return "{}.b1.dev{}".format(base_version, info["revision"])
 
     # This is some unknown branch or tag...
-    return "{}.a1.dev{}+{}".format(
+    return "{}a1.dev{}+{}".format(
         base_version,
         info["revision"],
-        info["branch"].replace("/", "."),
+        info["branch"].replace("/", ".").replace("-", "."),
     )
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150505/6173a836/attachment.html>