[CalendarServer-changes] [15730] twext/branches/users/cdaboo/better-next-job/setup.py
source_changes at macosforge.org
source_changes at macosforge.org
Fri Jul 1 06:52:06 PDT 2016
Revision: 15730
http://trac.calendarserver.org//changeset/15730
Author: cdaboo at apple.com
Date: 2016-07-01 06:52:06 -0700 (Fri, 01 Jul 2016)
Log Message:
-----------
Properly parse svn info when on a branch.
Modified Paths:
--------------
twext/branches/users/cdaboo/better-next-job/setup.py
Modified: twext/branches/users/cdaboo/better-next-job/setup.py
===================================================================
--- twext/branches/users/cdaboo/better-next-job/setup.py 2016-06-30 21:01:44 UTC (rev 15729)
+++ twext/branches/users/cdaboo/better-next-job/setup.py 2016-07-01 13:52:06 UTC (rev 15730)
@@ -79,7 +79,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,
@@ -181,10 +181,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/20160701/e33478b7/attachment.html>
More information about the calendarserver-changes
mailing list