From aa96842c84c8f67bbfebd1033611b48f521718b4 Mon Sep 17 00:00:00 2001
From: Benjamin Drung <bdrung@ubuntu.com>
Date: Mon, 23 May 2011 23:44:45 +0200
Subject: [PATCH] Remove trailing spaces.
---
ack-sync | 4 ++--
check-mir | 2 +-
debian/changelog | 4 ++--
doc/bitesize.1 | 2 +-
doc/harvest.1 | 4 ++--
harvest | 6 +++---
ubuntutools/test/test_config.py | 2 +-
ubuntutools/test/test_update_maintainer.py | 4 ++--
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ack-sync b/ack-sync
index a0bebd9..faafdc7 100755
--- a/ack-sync
+++ b/ack-sync
@@ -186,7 +186,7 @@ def ack_sync(bug_numbers, all_package, all_version, all_section, update,
print "Taking email address from local file: " + \
uploader_email
- # Try to find a Ubuntu bug task, against which the package is raised.
+ # Try to find a Ubuntu bug task, against which the package is raised.
for t in bug.bug_tasks:
if t.bug_target_name.endswith(' (Ubuntu)'):
task = t
@@ -198,7 +198,7 @@ def ack_sync(bug_numbers, all_package, all_version, all_section, update,
task = bug.bug_tasks[0]
print ("W: Could not find bug task for a Ubuntu package."
" Using task '%s'" % task.bug_target_name)
-
+
if all_package is not None:
package = all_package
else:
diff --git a/check-mir b/check-mir
index 4f4686e..a63bd99 100755
--- a/check-mir
+++ b/check-mir
@@ -41,7 +41,7 @@ def check_support(apt_cache, pkgname, alt=False):
except KeyError:
print >> sys.stderr, prefix, 'does not exist (pure virtual?)'
return False
-
+
section = pkg.candidate.section
if section.startswith('universe') or section.startswith('multiverse'):
# check if the source package is in main and thus will only need binary
diff --git a/debian/changelog b/debian/changelog
index a19cf33..7e44143 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ ubuntu-dev-tools (0.124) UNRELEASED; urgency=low
[ Daniel Holbach ]
* bitesize:
- - display error message properly.
+ - display error message properly.
- error out if bug is already marked as 'bitesize'.
- rephrase bug comment and subscribe person who adds the comment.
- work-around LP:336866 and LP:254901.
@@ -33,7 +33,7 @@ ubuntu-dev-tools (0.123) unstable; urgency=low
- Support Debian experimental.
[ Daniel Holbach ]
- * bitesize, doc/bitesize.1: add script to tag a bug as bitesize and add a
+ * bitesize, doc/bitesize.1: add script to tag a bug as bitesize and add a
comment that you are willing to help with fixing the bug.
[ Benjamin Drung ]
diff --git a/doc/bitesize.1 b/doc/bitesize.1
index 68fdca1..bd120f9 100644
--- a/doc/bitesize.1
+++ b/doc/bitesize.1
@@ -48,7 +48,7 @@ The default value for \fB--lpinstance\fR.
.BR ubuntu\-dev\-tools (5)
.SH AUTHORS
-\fBbitesize\fR and this manual page were written by Daniel Holbach
+\fBbitesize\fR and this manual page were written by Daniel Holbach
<daniel.holbach@canonical.com>.
.PP
Both are released under the terms of the GNU General Public License, version 3.
diff --git a/doc/harvest.1 b/doc/harvest.1
index 44b3db0..b4063bf 100644
--- a/doc/harvest.1
+++ b/doc/harvest.1
@@ -7,12 +7,12 @@ harvest \- grabs information about a given source package from harvest.ubuntu.co
\fBharvest\fP <\fIsource package name\fP>
.SH DESCRIPTION
-\fBharvest\fP is a script that downloads information about development
+\fBharvest\fP is a script that downloads information about development
opportunities from harvest.ubuntu.com and gives a summary of the types of
opportunities.
.SH AUTHORS
-\fBharvest\fP and its manpage were written by Daniel Holbach
+\fBharvest\fP and its manpage were written by Daniel Holbach
<daniel.holbach@ubuntu.com>.
.PP
Both are released under the GNU General Public License, version 3 or
diff --git a/harvest b/harvest
index a0b9f53..570c37e 100755
--- a/harvest
+++ b/harvest
@@ -22,7 +22,7 @@
# harvest.ubuntu.com
#
#
-# Daniel Holbach
+# Daniel Holbach
# (c) 2011 Canonical
from optparse import OptionParser
@@ -63,8 +63,8 @@ def main():
data = json.loads(response)
print >> sys.stdout, \
"""%s has %s opportunities: %s
-Find out more: %sopportunities/package/%s""" % (pkg,
- data["total"],
+Find out more: %sopportunities/package/%s""" % (pkg,
+ data["total"],
opportunity_summary(data),
BASE_URL,
pkg)
diff --git a/ubuntutools/test/test_config.py b/ubuntutools/test/test_config.py
index 6e41485..2f4a2ed 100644
--- a/ubuntutools/test/test_config.py
+++ b/ubuntutools/test/test_config.py
@@ -71,7 +71,7 @@ class ConfigTestCase(mox.MoxTestBase, unittest.TestCase):
self._config_files['user'] = """#COMMENT=yes
\tTAB_INDENTED=yes
SPACE_INDENTED=yes
-SPACE_SUFFIX=yes
+SPACE_SUFFIX=yes
SINGLE_QUOTE='yes no'
DOUBLE_QUOTE="yes no"
QUOTED_QUOTE="it's"
diff --git a/ubuntutools/test/test_update_maintainer.py b/ubuntutools/test/test_update_maintainer.py
index b2a95fd..6ad76e7 100644
--- a/ubuntutools/test/test_update_maintainer.py
+++ b/ubuntutools/test/test_update_maintainer.py
@@ -152,7 +152,7 @@ endif
"""
_SEAHORSE_PLUGINS_CONTROL = """# This file is autogenerated. DO NOT EDIT!
-#
+#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
@@ -169,7 +169,7 @@ Package: seahorse-plugins
"""
_SEAHORSE_PLUGINS_UPDATED = """# This file is autogenerated. DO NOT EDIT!
-#
+#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.