From fd1e8f6ac79624e8541968f926826eec597a9d1d Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Wed, 16 Jul 2014 17:15:03 +0300 Subject: [PATCH] buildpackage-rpm: minor refactor Change-Id: Ibe43e3e948cb8854dadfc03449854ef044370237 Signed-off-by: Markus Lehtonen --- gbp/scripts/buildpackage_rpm.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py index c84b0a2..be938aa 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': -- 2.7.4