Merge pull request #9 from edquist/SOFTWARE-1876

do not enforce vcs branch checks for scratch builds (SOFTWARE-1876)
opensciencegrid · Jun 17, 2016 · 1022303 · 1022303
2 parents ec5fbba + f0d22d1
commit 1022303
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/osgbuild/main.py b/osgbuild/main.py
@@ -84,7 +84,8 @@ def main(argv):
                 print "Exiting"
                 return 1
 
-            vcs.verify_correct_branch(pkg, buildopts)
+            if not buildopts['scratch']:
+                vcs.verify_correct_branch(pkg, buildopts)
     else:
         # verify package dirs
         for pkg in package_dirs: