[PATCH 1/8] Correct trailing white space.
Ben Finney
bignose at debian.org
Sat Jan 14 16:23:51 UTC 2017
---
.gitignore | 2 +-
lib/debian/debian_support.py | 26 +++++++++++++-------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/.gitignore b/.gitignore
index 29721627..ad1300fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ README.debtags
setup.py
debian/files
debian/*.debhelper.log
-debian/*.debhelper
+debian/*.debhelper
debian/*.substvars
debian/python-debian/
debian/python3-debian/
diff --git a/lib/debian/debian_support.py b/lib/debian/debian_support.py
index 86af1277..d5bb6665 100644
--- a/lib/debian/debian_support.py
+++ b/lib/debian/debian_support.py
@@ -1,17 +1,17 @@
# debian_support.py -- Python module for Debian metadata
# Copyright (C) 2005 Florian Weimer <fw at deneb.enyo.de>
# Copyright (C) 2010 John Wright <jsw at debian.org>
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
@@ -62,7 +62,7 @@ class ParseError(Exception):
msg - error message
"""
-
+
def __init__(self, filename, lineno, msg):
assert type(lineno) == types.IntType
self.filename = filename
@@ -355,7 +355,7 @@ class PackageFile:
line = self.file.readline()
self.lineno += 1
continue
-
+
match = self.re_field.match(line)
if not match:
self.raise_syntax_error("expected package field")
@@ -469,7 +469,7 @@ def patches_from_ed_script(source,
"""
i = iter(source)
-
+
for line in i:
match = re_cmd.match(line)
if match is None:
@@ -563,7 +563,7 @@ def download_file(remote, local):
remote - URL, without the .gz suffix
local - name of the local file
"""
-
+
lines = download_gunzip_lines(remote + '.gz')
replace_file(lines, local)
return lines
@@ -588,7 +588,7 @@ def update_file(remote, local, verbose=None):
local_hash = read_lines_sha1(lines)
patches_to_apply = []
patch_hashes = {}
-
+
import urllib
index_name = remote + '.diff/Index'
@@ -629,9 +629,9 @@ def update_file(remote, local, verbose=None):
# remaining patches.
if patches_to_apply or hist_hash == local_hash:
patches_to_apply.append(patch_name)
-
+
continue
-
+
if field == 'SHA1-Patches':
for entry in value.splitlines():
if entry == '':
@@ -640,10 +640,10 @@ def update_file(remote, local, verbose=None):
= re_whitespace.split(entry)
patch_hashes[patch_name] = patch_hash
continue
-
+
if verbose:
print("update_file: field %r ignored" % field)
-
+
if not patches_to_apply:
if verbose:
print("update_file: could not find historic entry", local_hash)
@@ -656,7 +656,7 @@ def update_file(remote, local, verbose=None):
if read_lines_sha1(patch_contents ) != patch_hashes[patch_name]:
raise ValueError("patch %r was garbled" % patch_name)
patch_lines(lines, patches_from_ed_script(patch_contents))
-
+
new_hash = read_lines_sha1(lines)
if new_hash != remote_hash:
raise ValueError("patch failed, got %s instead of %s"
--
2.11.0
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-python-debian-maint/attachments/20170115/3e4a1769/attachment.sig>
More information about the pkg-python-debian-maint
mailing list