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

[source_changes at macosforge.org]

Revision: 14606
          http://trac.calendarserver.org//changeset/14606
Author:   sagen at apple.com
Date:     2015-03-20 14:01:07 -0700 (Fri, 20 Mar 2015)
Log Message:
-----------
Remove the +modified

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

Modified: CalendarServer/trunk/setup.py
===================================================================
--- CalendarServer/trunk/setup.py	2015-03-18 23:24:04 UTC (rev 14605)
+++ CalendarServer/trunk/setup.py	2015-03-20 21:01:07 UTC (rev 14606)
@@ -143,16 +143,6 @@
         .format(info["project"], project_name)
     )
 
-    status = svn_status(source_root)
-
-    for entry in status:
-        # We have modifications.
-        modified = "+modified"
-        break
-    else:
-        modified = ""
-
-
     if info["branch"].startswith("tags/release/"):
         project_version = info["branch"][len("tags/release/"):]
         project, version = project_version.split("-")
@@ -163,7 +153,7 @@
             "Tagged version {!r} != {!r}".format(version, base_version)
         )
         # This is a correctly tagged release of this project.
-        return "{}{}".format(base_version, modified)
+        return base_version
 
     if info["branch"].startswith("branches/release/"):
         project_version = info["branch"][len("branches/release/"):]
@@ -179,19 +169,18 @@
         )
         # This is a release branch of this project.
         # Designate this as beta2, dev version based on svn revision.
-        return "{}.b2.dev{}{}".format(base_version, info["revision"], modified)
+        return "{}.b2.dev{}".format(base_version, info["revision"])
 
     if info["branch"].startswith("trunk"):
         # This is trunk.
         # Designate this as beta1, dev version based on svn revision.
-        return "{}.b1.dev{}{}".format(base_version, info["revision"], modified)
+        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("/", "."),
-        modified.replace("+", "."),
     )
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150320/8c6cd163/attachment.html>