From 6ae48e2bf5433e9ed35adfe7e39ab9444f1d85e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Mon, 29 Feb 2016 10:43:54 +0100 Subject: [PATCH] [createrepo-wrapper] Refactor code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Simplify the code a bit by removing conditions that don't help in any way: executing a loop zero times is the same as not executing it at all. Signed-off-by: Lubomír Sedlář --- pungi/wrappers/createrepo.py | 39 ++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/pungi/wrappers/createrepo.py b/pungi/wrappers/createrepo.py index ad8e48b9..b13b9b9a 100644 --- a/pungi/wrappers/createrepo.py +++ b/pungi/wrappers/createrepo.py @@ -28,15 +28,15 @@ class CreaterepoWrapper(object): self.mergerepo = "mergerepo" self.modifyrepo = "modifyrepo" - def get_createrepo_cmd(self, directory, baseurl=None, outputdir=None, excludes=None, pkglist=None, groupfile=None, cachedir=None, - update=True, update_md_path=None, skip_stat=False, checkts=False, split=False, pretty=True, database=True, checksum=None, - unique_md_filenames=True, distro=None, content=None, repo=None, revision=None, deltas=False, oldpackagedirs=None, - num_deltas=None, workers=None): + def get_createrepo_cmd(self, directory, baseurl=None, outputdir=None, excludes=None, + pkglist=None, groupfile=None, cachedir=None, update=True, + update_md_path=None, skip_stat=False, checkts=False, split=False, + pretty=True, database=True, checksum=None, unique_md_filenames=True, + distro=None, content=None, repo=None, revision=None, deltas=False, + oldpackagedirs=None, num_deltas=None, workers=None): # groupfile = /path/to/comps.xml - cmd = [self.createrepo] - - cmd.append(directory) + cmd = [self.createrepo, directory] if baseurl: cmd.append("--baseurl=%s" % baseurl) @@ -44,9 +44,8 @@ class CreaterepoWrapper(object): if outputdir: cmd.append("--outputdir=%s" % outputdir) - if excludes: - for i in force_list(excludes): - cmd.append("--excludes=%s" % i) + for i in force_list(excludes or []): + cmd.append("--excludes=%s" % i) if pkglist: cmd.append("--pkglist=%s" % pkglist) @@ -91,17 +90,14 @@ class CreaterepoWrapper(object): else: cmd.append("--simple-md-filenames") - if distro: - for i in force_list(distro): - cmd.append("--distro=%s" % i) + for i in force_list(distro or []): + cmd.append("--distro=%s" % i) - if content: - for i in force_list(content): - cmd.append("--content=%s" % i) + for i in force_list(content or []): + cmd.append("--content=%s" % i) - if repo: - for i in force_list(repo): - cmd.append("--repo=%s" % i) + for i in force_list(repo or []): + cmd.append("--repo=%s" % i) if revision: cmd.append("--revision=%s" % revision) @@ -109,9 +105,8 @@ class CreaterepoWrapper(object): if deltas: cmd.append("--deltas") - if oldpackagedirs: - for i in force_list(oldpackagedirs): - cmd.append("--oldpackagedirs=%s" % i) + for i in force_list(oldpackagedirs or []): + cmd.append("--oldpackagedirs=%s" % i) if num_deltas: cmd.append("--num-deltas=%d" % int(num_deltas))