Hello, thank you, I uploaded -3 without raising debhelper compat. Debdiff against original -1 attached. Filip On 2017/03/11 07:58, Niels Thykier wrote: > Control: tags -1 moreinfo confirmed > > Filip Pytloun: > > Package: release.debian.org > > Severity: normal > > User: release.debian.org@packages.debian.org > > Usertags: unblock > > > > Please unblock package reclass > > > > It's mainly fixing #857337 by backporting simple upstream code change > > that fixes handling of usage error that may happen pretty often and will > > help user to debug the issue by returning relevant information. > > > > Debdiff is included. > > > > Thank you > > > > unblock reclass/1.4.1-2 > > > > [...] > > Hi, > > Thanks for looking at fixing this bug. I am happy to accept the > undefined variable fix, but I would prefer it without the debhelper > compat bump. > > Would you kindly upload a -3 without the compat bump? > > Thanks, > ~Niels > > > >
diff -Nru reclass-1.4.1/debian/changelog reclass-1.4.1/debian/changelog
--- reclass-1.4.1/debian/changelog 2014-10-28 15:57:42.000000000 +0100
+++ reclass-1.4.1/debian/changelog 2017-03-11 10:14:58.000000000 +0100
@@ -1,3 +1,18 @@
+reclass (1.4.1-3) unstable; urgency=medium
+
+ * Revert d/compat and standards update to allow stretch migration
+
+ -- Filip Pytloun <filip@pytloun.cz> Sat, 11 Mar 2017 10:14:58 +0100
+
+reclass (1.4.1-2) unstable; urgency=medium
+
+ * d/patches: backport Fix UndefinedVariableError (Closes: #857337)
+ * Add d/watch file
+ * Raise d/compat to 10, update standards to 3.9.8
+ * Add myself as uploader
+
+ -- Filip Pytloun <filip@pytloun.cz> Fri, 10 Mar 2017 08:45:53 +0100
+
reclass (1.4.1-1) unstable; urgency=low
* New upstream release reverting the logging changes, which weren't ready
diff -Nru reclass-1.4.1/debian/control reclass-1.4.1/debian/control
--- reclass-1.4.1/debian/control 2014-10-25 20:45:57.000000000 +0200
+++ reclass-1.4.1/debian/control 2017-03-11 10:14:21.000000000 +0100
@@ -2,8 +2,12 @@
Section: python
Priority: extra
Maintainer: martin f. krafft <madduck@debian.org>
-Uploaders: Jonas Smedegaard <dr@jones.dk>
-Build-Depends: python-setuptools, python, debhelper (>= 8.9.7), python-sphinx, python-yaml
+Uploaders: Jonas Smedegaard <dr@jones.dk>, Filip Pytloun <filip@pytloun.cz>
+Build-Depends: debhelper (>= 8.9.7),
+ python,
+ python-setuptools,
+ python-sphinx,
+ python-yaml
Standards-Version: 3.9.6
XS-Python-Version: all
Homepage: http://reclass.pantsfullofunix.net/
@@ -13,7 +17,9 @@
Package: reclass
Architecture: all
Section: admin
-Depends: python-reclass (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
+Depends: python-reclass (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
Suggests: reclass-doc
Description: hierarchical inventory backend for configuration management systems
reclass is an "external node classifier" (ENC) as can be used with automation
@@ -38,7 +44,7 @@
Package: python-reclass
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-pkg-resources
+Depends: python-pkg-resources, ${misc:Depends}, ${python:Depends}
Description: hierarchical inventory backend for configuration management systems
reclass is an "external node classifier" (ENC) as can be used with automation
tools, such as Puppet, Salt, and Ansible. It is also a stand-alone tool for
@@ -61,7 +67,7 @@
Package: reclass-doc
Architecture: all
Section: doc
-Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
Description: reclass documentation
reclass is an "external node classifier" (ENC) as can be used with automation
tools, such as Puppet, Salt, and Ansible. It is also a stand-alone tool for
diff -Nru reclass-1.4.1/debian/patches/0001-Fix-UndefinedVariableError-which-had-uh-undefined-va.patch reclass-1.4.1/debian/patches/0001-Fix-UndefinedVariableError-which-had-uh-undefined-va.patch
--- reclass-1.4.1/debian/patches/0001-Fix-UndefinedVariableError-which-had-uh-undefined-va.patch 1970-01-01 01:00:00.000000000 +0100
+++ reclass-1.4.1/debian/patches/0001-Fix-UndefinedVariableError-which-had-uh-undefined-va.patch 2017-03-10 09:19:32.000000000 +0100
@@ -0,0 +1,31 @@
+From fbd22d42a20a0fdd53bc42fd27ad9f3d6af70f80 Mon Sep 17 00:00:00 2001
+From: Michael Kuty <6du1ro.n@gmail.com>
+Date: Fri, 16 Oct 2015 18:10:18 +0200
+Subject: [PATCH 1/2] Fix UndefinedVariableError, which had, uh, undefined
+ variables
+
+Signed-off-by: martin f. krafft <madduck@madduck.net>
+---
+ reclass/errors.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/reclass/errors.py b/reclass/errors.py
+index 4da2bc3..ddb95fd 100644
+--- a/reclass/errors.py
++++ b/reclass/errors.py
+@@ -131,9 +131,11 @@ class UndefinedVariableError(InterpolationError):
+ super(UndefinedVariableError, self).__init__(msg=None)
+ self._var = var
+ self._context = context
++ var = property(lambda self: self._var)
++ context = property(lambda self: self._context)
+
+ def _get_message(self):
+- msg = "Cannot resolve " + var.join(PARAMETER_INTERPOLATION_SENTINELS)
++ msg = "Cannot resolve " + self._var.join(PARAMETER_INTERPOLATION_SENTINELS)
+ if self._context:
+ msg += ' in the context of %s' % self._context
+ return msg
+--
+2.1.4
+
diff -Nru reclass-1.4.1/debian/patches/series reclass-1.4.1/debian/patches/series
--- reclass-1.4.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ reclass-1.4.1/debian/patches/series 2017-03-10 09:19:32.000000000 +0100
@@ -0,0 +1 @@
+0001-Fix-UndefinedVariableError-which-had-uh-undefined-va.patch
diff -Nru reclass-1.4.1/debian/watch reclass-1.4.1/debian/watch
--- reclass-1.4.1/debian/watch 1970-01-01 01:00:00.000000000 +0100
+++ reclass-1.4.1/debian/watch 2017-03-10 09:19:32.000000000 +0100
@@ -0,0 +1,3 @@
+version=3
+#opts=pgpsigurlmangle=s/$/.asc/ \
+https://pypi.debian.net/reclass/reclass-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
Attachment:
signature.asc
Description: PGP signature