[Checkins] SVN: keas.build/trunk/ support branch names ending with *.x

[Paul Carduner]

Log message for revision 105453:
  support branch names ending with *.x

Changed:
  U   keas.build/trunk/CHANGES.txt
  U   keas.build/trunk/src/keas/build/package.py

-=-
Modified: keas.build/trunk/CHANGES.txt
===================================================================
--- keas.build/trunk/CHANGES.txt	2009-11-02 16:26:03 UTC (rev 105452)
+++ keas.build/trunk/CHANGES.txt	2009-11-02 22:18:31 UTC (rev 105453)
@@ -4,7 +4,8 @@
 0.1.6 (unreleased)
 ------------------
 
-- ...
+- Improvement: When determining released versions of a branch, support
+  branch names ending with .x, as in MyProject-0.3.x
 
 0.1.5 (2009-10-16)
 ------------------

Modified: keas.build/trunk/src/keas/build/package.py
===================================================================
--- keas.build/trunk/src/keas/build/package.py	2009-11-02 16:26:03 UTC (rev 105452)
+++ keas.build/trunk/src/keas/build/package.py	2009-11-02 22:18:31 UTC (rev 105453)
@@ -145,7 +145,9 @@
         # filter versions by ones that came from the branch we are building from.
         if self.options.branch and '-' in self.options.branch:
             branchVersion = self.options.branch.split('-')[-1]
-            branchVersionParts = pkg_resources.parse_version(branchVersion)[:-1]
+            branchVersionParts = tuple([p for p in
+                                        pkg_resources.parse_version(branchVersion)
+                                        if not p.startswith('*')])
             def fromBranch(v):
                 versionParts = pkg_resources.parse_version(v)
                 return versionParts[:len(branchVersionParts)] == branchVersionParts