tags 691230 + patch
thanks
Dear maintainer,
Upstream has a patch for the issue in git commit dcd78df45c52 [1] /
bzr revision 158 [2], which applies cleanly to pyrrd/backend/external.py
in the debian source.
[1]
https://code.google.com/p/pyrrd/source/detail?r=dcd78df45c526e3295470632c9ea1ebb7c259761
[2] http://bazaar.launchpad.net/~oubiwann/pyrrd/trunk/revision/158
I've used the attached .debdiff to test the patch and confirm that
it actually fixes the issue, which it does, but it is not lintian
clear (direct-changes-in-diff-but-no-patch-system) and it doesn't
properly document the source of the patch.
Please let me know if you would appreciate a more invasive patch that
uses quilt, or one that documents the source in some other way
Thanks in advance
--
Elena ``of Valhalla'' Grandi
diff -u pyrrd-0.1.0/debian/changelog pyrrd-0.1.0/debian/changelog
--- pyrrd-0.1.0/debian/changelog
+++ pyrrd-0.1.0/debian/changelog
@@ -1,3 +1,10 @@
+pyrrd (0.1.0-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Backport fix for RRD.fetch (Closes: #691230)
+
+ -- Elena Grandi <elena.valha...@gmail.com> Fri, 15 Feb 2013 18:38:14 +0100
+
pyrrd (0.1.0-1) unstable; urgency=low
* Team upload
only in patch2:
unchanged:
--- pyrrd-0.1.0.orig/PyRRD.egg-info/PKG-INFO
+++ pyrrd-0.1.0/PyRRD.egg-info/PKG-INFO
@@ -1,4 +1,4 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: PyRRD
Version: 0.1.0
Summary: An Object-Oriented Python Interface for RRDTool
only in patch2:
unchanged:
--- pyrrd-0.1.0.orig/pyrrd/backend/external.py
+++ pyrrd-0.1.0/pyrrd/backend/external.py
@@ -264,7 +264,7 @@
data += [unicode(x) for x in obj.rra]
return (obj.filename, params + data)
- if function == 'update':
+ elif function == 'update':
validParams = ['template']
params = common.buildParameters(obj, validParams)
FIRST_VALUE = 0
@@ -277,15 +277,15 @@
data = [data for data, nil in obj.values]
return (obj.filename, params + data)
- if function == 'fetch':
+ elif function == 'fetch':
validParams = ['resolution', 'start', 'end']
params = common.buildParameters(obj, validParams)
- return (obj.filename, obj.cf, params)
+ return (obj.filename, [obj.cf] + params)
- if function == 'info':
+ elif function == 'info':
return (obj.filename, obj)
- if function == 'graph':
+ elif function == 'graph':
validParams = ['start', 'end', 'step', 'title',
'vertical_label', 'width', 'height', 'only_graph',
'upper_limit', 'lower_limit', 'rigid', 'alt_autoscale',
