buildpackage-rpm: minor refactor
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Wed, 16 Jul 2014 14:15:03 +0000 (17:15 +0300)
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Fri, 14 Nov 2014 12:47:21 +0000 (14:47 +0200)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
gbp/scripts/buildpackage_rpm.py

index c84b0a2..be938aa 100755 (executable)
@@ -591,14 +591,11 @@ def main(argv):
                     dst = os.path.join(spec_dir, f)
                 else:
                     dst = os.path.join(source_dir, f)
-                try:
-                    if os.path.isdir(src):
-                        # dir is not packaging files, skip it
-                        continue
-                    else:
+                if not os.path.isdir(src):
+                    try:
                         shutil.copy2(src, dst)
-                except IOError, err:
-                    raise GbpError, "Error exporting files: %s" % err
+                    except IOError as err:
+                        raise GbpError, "Error exporting files: %s" % err
             spec.specdir = os.path.abspath(spec_dir)
 
             if options.orig_prefix != 'auto':