applied ian's fix

mopytools/build_rpms.py

@@ -187,6 +187,9 @@ def build_external_deps_rpms(channel, options):
     # we have a requirement file, we can go ahead and feed pypi2rpm with it
     with open(req_file) as f:
         for line in f.readlines():
+            line = line.strip()
+            if not line or line.startswith('#'):
+                continue
             project, version = split_version(line)
             build_rpm(project=project, dist_dir=options.dist_dir,
                       version=version, index=options.index,

mopytools/util.py

@@ -189,7 +189,7 @@ def __timer(*args, **kw):
     return _timer
 
 
-def run(command, timeout=300, verbose=False):
+def run(command, timeout=300, verbose=False, allow_exit=False):
     err_output = []
     out_output = []
 
@@ -210,10 +210,12 @@ def _run():
         code = sb.returncode
 
         if code != 0:
-            print("%r failed with code %d" % (command, code))
-            print(stdout)
-            print(stderr)
-            sys.exit(code)
+            if not allow_exit or verbose:
+                print("%r failed with code %d" % (command, code))
+                print(stdout)
+                print(stderr)
+            if not allow_exit:
+                sys.exit(code)
         elif verbose:
             print(stdout)
             print(stderr)
@@ -234,7 +236,7 @@ def envname(name):
 
 def has_changes(timeout=5, verbose=False):
     if is_git():
-        code, out, err = run('git diff --exit-code', timeout, verbose)
+        code, out, err = run('git diff --exit-code', timeout, verbose, allow_exit=True)
         return code == 1
     else:
         code, out, err = run('hg diff', timeout, verbose)