Control: tags 865577 + pending
Dear maintainer,
I've prepared an NMU for cloud-init (versioned as 0.7.9-2.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I should
delay it longer or cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru cloud-init-0.7.9/debian/changelog cloud-init-0.7.9/debian/changelog
--- cloud-init-0.7.9/debian/changelog 2017-02-02 15:23:41.000000000 +0200
+++ cloud-init-0.7.9/debian/changelog 2017-07-20 13:24:49.000000000 +0300
@@ -1,3 +1,10 @@
+cloud-init (0.7.9-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add patch from Joonas Kylmälä to fix FTBFS. (Closes: #865577)
+
+ -- Adrian Bunk <b...@debian.org> Thu, 20 Jul 2017 13:24:49 +0300
+
cloud-init (0.7.9-2) unstable; urgency=medium
* Add net-tools as runtime depends (Closes: #853926).
diff -Nru cloud-init-0.7.9/debian/patches/0001-Fix-Python-code-style-errors-Closes-865577.patch cloud-init-0.7.9/debian/patches/0001-Fix-Python-code-style-errors-Closes-865577.patch
--- cloud-init-0.7.9/debian/patches/0001-Fix-Python-code-style-errors-Closes-865577.patch 1970-01-01 02:00:00.000000000 +0200
+++ cloud-init-0.7.9/debian/patches/0001-Fix-Python-code-style-errors-Closes-865577.patch 2017-07-20 13:24:49.000000000 +0300
@@ -0,0 +1,45 @@
+From 8afb8941e696b74ca03a7c80e15eed320e1b8e72 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <joonas.kylm...@iki.fi>
+Date: Sun, 25 Jun 2017 07:42:13 +0200
+Subject: [PATCH] Fix Python code style errors (Closes #865577)
+
+This commit is based on Joshua Powers' upstream commit
+with hash 5f14a0b1ca3079e4ab43d615840866a4b7d8df6a
+(code-style: make master pass pycodestyle (2.3.1) cleanly).
+---
+ tools/make-mime.py | 2 +-
+ tools/mock-meta.py | 5 ++++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/tools/make-mime.py b/tools/make-mime.py
+index 12727126..f6a72044 100755
+--- a/tools/make-mime.py
++++ b/tools/make-mime.py
+@@ -22,7 +22,7 @@ def file_content_type(text):
+ try:
+ filename, content_type = text.split(":", 1)
+ return (open(filename, 'r'), filename, content_type.strip())
+- except:
++ except ValueError:
+ raise argparse.ArgumentError("Invalid value for %r" % (text))
+
+
+diff --git a/tools/mock-meta.py b/tools/mock-meta.py
+index d74f9e31..2165d623 100755
+--- a/tools/mock-meta.py
++++ b/tools/mock-meta.py
+@@ -249,7 +249,10 @@ class MetaDataHandler(object):
+ try:
+ key_id = int(mybe_key)
+ key_name = key_ids[key_id]
+- except:
++ except ValueError:
++ raise WebException(httplib.BAD_REQUEST,
++ "%s: not an integer" % mybe_key)
++ except KeyError:
+ raise WebException(httplib.BAD_REQUEST,
+ "Unknown key id %r" % mybe_key)
+ # Extract the possible sub-params
+--
+2.11.0
+
diff -Nru cloud-init-0.7.9/debian/patches/series cloud-init-0.7.9/debian/patches/series
--- cloud-init-0.7.9/debian/patches/series 2017-02-02 15:23:41.000000000 +0200
+++ cloud-init-0.7.9/debian/patches/series 2017-07-20 13:24:49.000000000 +0300
@@ -7,3 +7,4 @@
0007-Skip-Cloudstack-tests-that-expect-network.patch
0008-sysvinit-fs-dependencies.patch
0009-Drop-all-unused-extended-version-handling.patch
+0001-Fix-Python-code-style-errors-Closes-865577.patch
