Tagging pyutilib.virtualenv 4.5.1

Author: whart222

CHANGELOG.txt

@@ -2,6 +2,12 @@
  pyutilib.virtualenv CHANGELOG
 ===============================
 
+-------------------------------------------------------------------------------
+ 4.5.1
+-------------------------------------------------------------------------------
+
+- Bug fix to ensure that the proper branch is checked out.
+
 -------------------------------------------------------------------------------
  4.5
 -------------------------------------------------------------------------------

pyutilib/virtualenv/header.py

@@ -510,14 +510,16 @@ def perform_install(self, dir=None, install=True, preinstall=False):
         print("-----------------------------------------------------------------")
         print("  Installing branch")
         print("  Checking out source for package "+self.name)
-        print("  %s %s" % (str(using_git), str(self.root)))
+        #print("  %s %s" % (str(using_git), str(self.root)))
         if self.local:
             print("     Package dir: "+self.local)
         elif using_git and not self.root is None:
             if '%23' in self.root:
-                self.root = self.root.split('%23')[0]
+                self.root, self.branch = self.root.split('%23')
             elif '#' in self.root:
-                self.root = self.root.split('#')[0]
+                self.root, self.branch = self.root.split('#')
+            else:
+                self.branch = None
             print("     Git dir: "+self.root)
         else:
             print("     Subversion dir: "+self.pkgdir)
@@ -527,16 +529,11 @@ def perform_install(self, dir=None, install=True, preinstall=False):
         elif using_git and not self.root is None and '.git' in self.root:
             print("-----------------------------------------------------------------")
             try:
-                if '%23' in self.root:
-                    branch= ['-b', self.root.split('%23')[1]]
-                    url= self.root.split('%23')[0]
-                elif '#' in self.root:
-                    branch= ['-b', self.root.split('#')[1]]
-                    url= self.root.split('#')[0]
-                else:
+                if self.branch is None:
                     branch = []
-                    url= self.root
-                self.run([self.git, 'clone'] + branch + [url, dir])
+                else:
+                    branch= ['-b', self.branch]
+                self.run([self.git, 'clone'] + branch + [self.root, dir])
             except OSError:
                 err,tb = sys.exc_info()[1:3] # BUG?
                 print("")

pyutilib/virtualenv/vpy_install.py

@@ -3835,14 +3835,16 @@ def perform_install(self, dir=None, install=True, preinstall=False):
         print("-----------------------------------------------------------------")
         print("  Installing branch")
         print("  Checking out source for package "+self.name)
-        print("  %s %s" % (str(using_git), str(self.root)))
+        #print("  %s %s" % (str(using_git), str(self.root)))
         if self.local:
             print("     Package dir: "+self.local)
         elif using_git and not self.root is None:
             if '%23' in self.root:
-                self.root = self.root.split('%23')[0]
+                self.root, self.branch = self.root.split('%23')
             elif '#' in self.root:
-                self.root = self.root.split('#')[0]
+                self.root, self.branch = self.root.split('#')
+            else:
+                self.branch = None
             print("     Git dir: "+self.root)
         else:
             print("     Subversion dir: "+self.pkgdir)
@@ -3852,16 +3854,11 @@ def perform_install(self, dir=None, install=True, preinstall=False):
         elif using_git and not self.root is None and '.git' in self.root:
             print("-----------------------------------------------------------------")
             try:
-                if '%23' in self.root:
-                    branch= ['-b', self.root.split('%23')[1]]
-                    url= self.root.split('%23')[0]
-                elif '#' in self.root:
-                    branch= ['-b', self.root.split('#')[1]]
-                    url= self.root.split('#')[0]
-                else:
+                if self.branch is None:
                     branch = []
-                    url= self.root
-                self.run([self.git, 'clone'] + branch + [url, dir])
+                else:
+                    branch= ['-b', self.branch]
+                self.run([self.git, 'clone'] + branch + [self.root, dir])
             except OSError:
                 err,tb = sys.exc_info()[1:3] # BUG?
                 print("")

setup.py

@@ -22,7 +22,7 @@ def read(*rnames):
 
 
 setup(name="pyutilib.virtualenv",
-    version='4.5',
+    version='4.5.1',
     maintainer='William E. Hart',
     maintainer_email='wehart@sandia.gov',
     url = 'https://software.sandia.gov/svn/public/pyutilib/pyutilib.virtualenv',