From c47deff711acf4fcb3775ca7566271773ac10567 Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Tue, 31 Jul 2012 16:28:32 +0200
Subject: Remove multiple spaces

---
 gbp/git/repository.py              |  8 ++++----
 gbp/scripts/common/buildpackage.py |  4 ++--
 gbp/scripts/dch.py                 | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index d581094..0da4060 100644
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -55,7 +55,7 @@ class GitRepository(object):
         if ret:
             raise GitRepositoryError(
                 "Failed to get repository state at '%s'" % self.path)
-        self._bare = False if  out.strip() != 'true' else True
+        self._bare = False if out.strip() != 'true' else True
         self._git_dir = '' if self._bare else '.git'
 
     def __init__(self, path):
@@ -499,7 +499,7 @@ class GitRepository(object):
         @return: C{True} if the repository has that tag, C{False} otherwise
         @rtype: C{bool}
         """
-        out, ret =  self._git_getoutput('tag', [ '-l', tag ])
+        out, ret = self._git_getoutput('tag', [ '-l', tag ])
         return [ False, True ][len(out)]
 
     def find_tag(self, commit, pattern=None):
@@ -1210,7 +1210,7 @@ class GitRepository(object):
 
     def get_commit_info(self, commit):
         """
-        Look up data of a specific  commit
+        Look up data of a specific commit
 
         @param commit: the commit to inspect
         @return: the commit's including id, author, email, subject and body
@@ -1426,7 +1426,7 @@ class GitRepository(object):
                 os.makedirs(abspath)
             try:
                 GitCommand("init", args.args, cwd=abspath)()
-            except CommandExecFailed as  excobj:
+            except CommandExecFailed as excobj:
                 raise GitRepositoryError("Error running git init: %s" % excobj)
 
             if description:
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
-- 
cgit v1.2.3