[Checkins] SVN: keas.build/trunk/src/keas/build/package.py fix my error

Adam Groszer agroszer at gmail.com
Wed Feb 16 08:23:08 EST 2011


Log message for revision 120379:
  fix my error

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

-=-
Modified: keas.build/trunk/src/keas/build/package.py
===================================================================
--- keas.build/trunk/src/keas/build/package.py	2011-02-16 12:22:07 UTC (rev 120378)
+++ keas.build/trunk/src/keas/build/package.py	2011-02-16 13:23:08 UTC (rev 120379)
@@ -408,6 +408,7 @@
                 defaultVersion = base.guessNextVersion(versions[-1])
             else:
                 defaultVersion = versions[-1]
+        branch = self.options.branch
         while True:
             version = base.getInput(
                 'Version for `%s`' %self.pkg, defaultVersion,
@@ -424,7 +425,6 @@
                 if not self.options.offline:
                     # 4.1. Determine the branch from which to base the release
                     # on.
-                    branch = self.options.branch
                     if branch is None:
                         print 'Available Branches:'
                         for branch in self.getBranches():
@@ -440,6 +440,8 @@
         logger.info('Chosen version: ' + version)
 
         # save the info for build.py
+        if branch is None:
+            branch = 'trunk'
         self.branchUrl = self.getBranchURL(branch)
         self.branchRevision = self.getRevision(self.branchUrl)
 



More information about the checkins mailing list