summaryrefslogtreecommitdiff
path: root/gbp/scripts
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2012-07-31 16:28:32 +0200
committerGuido Günther <agx@sigxcpu.org>2012-07-31 16:31:34 +0200
commitc47deff711acf4fcb3775ca7566271773ac10567 (patch)
tree26655dbe4311c0145b5c5bfea62adc134114d382 /gbp/scripts
parentc4524f830d2de61a7107b0fb140718d985970412 (diff)
Remove multiple spaces
Diffstat (limited to 'gbp/scripts')
-rw-r--r--gbp/scripts/common/buildpackage.py4
-rw-r--r--gbp/scripts/dch.py10
2 files changed, 7 insertions, 7 deletions
diff --git a/gbp/scripts/common/buildpackage.py b/gbp/scripts/common/buildpackage.py
index 8bbf143..2c99895 100644
--- a/gbp/scripts/common/buildpackage.py
+++ b/gbp/scripts/common/buildpackage.py
@@ -57,7 +57,7 @@ def git_archive_submodules(repo, treeish, output, prefix, comp_type, comp_level,
for (subdir, commit) in repo.get_submodules(treeish):
tarpath = [subdir, subdir[2:]][subdir.startswith("./")]
- gbp.log.debug("Processing submodule %s (%s)" % (subdir, commit[0:8]))
+ gbp.log.debug("Processing submodule %s (%s)" % (subdir, commit[0:8]))
repo.archive(format='tar', prefix='%s/%s/' % (prefix, tarpath),
output=submodule_tarfile, treeish=commit, cwd=subdir)
CatenateTarArchive(tarfile)(submodule_tarfile)
@@ -103,7 +103,7 @@ def dump_tree(repo, export_dir, treeish, with_submodules):
if repo.has_submodules():
repo.update_submodules()
for (subdir, commit) in repo.get_submodules(treeish):
- gbp.log.info("Processing submodule %s (%s)" % (subdir, commit[0:8]))
+ gbp.log.info("Processing submodule %s (%s)" % (subdir, commit[0:8]))
tarpath = [subdir, subdir[2:]][subdir.startswith("./")]
os.chdir(subdir)
pipe = pipes.Template()
diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py
index dd5503a..c2ac50e 100644
--- a/gbp/scripts/dch.py
+++ b/gbp/scripts/dch.py
@@ -78,7 +78,7 @@ def spawn_dch(msg=[], author=None, email=None, newversion=False, version=None,
if distribution:
distopt = "--distribution=%s" % distribution
- cmd = '%(env)s dch --no-auto-nmu %(distopt)s %(versionopt)s %(dch_options)s ' % locals()
+ cmd = '%(env)s dch --no-auto-nmu %(distopt)s %(versionopt)s %(dch_options)s ' % locals()
if msg:
cmd += '-- "[[[insert-git-dch-commit-message-here]]]"'
else:
@@ -379,7 +379,7 @@ def main(argv):
version_group.add_option("--bpo", dest="bpo", action="store_true", default=False,
help="Increment the Debian release number for an upload to backports, and add a backport upload changelog comment.")
version_group.add_option("--nmu", dest="nmu", action="store_true", default=False,
- help="Increment the Debian release number for a non-maintainer upload")
+ help="Increment the Debian release number for a non-maintainer upload")
version_group.add_option("--qa", dest="qa", action="store_true", default=False,
help="Increment the Debian release number for a Debian QA Team upload, and add a QA upload changelog comment.")
version_group.add_option("--team", dest="team", action="store_true", default=False,
@@ -453,11 +453,11 @@ def main(argv):
if options.new_version or options.bpo or options.nmu or options.qa or options.team:
if options.bpo:
version_change['increment'] = '--bpo'
- elif options.nmu:
+ elif options.nmu:
version_change['increment'] = '--nmu'
- elif options.qa:
+ elif options.qa:
version_change['increment'] = '--qa'
- elif options.team:
+ elif options.team:
version_change['increment'] = '--team'
else:
version_change['version'] = options.new_version