From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Wed, 16 Jul 2014 14:15:03 +0000 (+0300)
Subject: buildpackage-rpm: minor refactor
X-Git-Tag: tizen/0.6.22-20150206~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2300f25516748ee58ab9258e7831b06b58884d46;p=tools%2Fgit-buildpackage.git

buildpackage-rpm: minor refactor

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---

diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py
index c84b0a2e..be938aae 100755
--- a/gbp/scripts/buildpackage_rpm.py
+++ b/gbp/scripts/buildpackage_rpm.py
@@ -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':