Merge lp:~sajoupa/ubuntu/precise/weathermap4rrd/weathermap4rrd-fix-rrdtool-version-support into lp:ubuntu/precise/weathermap4rrd

Proposed by Laurent Sesques on 2016-02-12
Status: Needs review
Proposed branch: lp:~sajoupa/ubuntu/precise/weathermap4rrd/weathermap4rrd-fix-rrdtool-version-support
Merge into: lp:ubuntu/precise/weathermap4rrd
Diff against target: 12 lines (+1/-1)
1 file modified
weathermap (+1/-1)
To merge this branch: bzr merge lp:~sajoupa/ubuntu/precise/weathermap4rrd/weathermap4rrd-fix-rrdtool-version-support
Reviewer Review Type Date Requested Status
Marc Deslauriers 2016-02-12 Needs Fixing on 2016-05-10
Review via email: mp+285835@code.launchpad.net

Description of the Change

Keep the same behaviour with rrd versions >= 1.2 (precise and trusty have 1.4, wily 1.5)

To post a comment you must log in.
Marc Deslauriers (mdeslaur) wrote :

Thanks for the merge request, but it's hard to understand what the exact issue is when there is no bug associated to this merge request. Please do the following:

1- File an Ubuntu bug
2
- Link the Debian bug to the new Ubuntu bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=612173
3- Do a new merge proposal that targets the current development release, and includes an appropriate debian/changelog entry that refers to the bug

Thanks!

review: Needs Fixing

Unmerged revisions

5. By Laurent Sesques on 2016-02-12

[sajoupa] Avoiding regressions when rrd's version is incremented

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'weathermap'
2--- weathermap 2008-11-24 10:18:09 +0000
3+++ weathermap 2016-02-12 07:40:24 +0000
4@@ -101,7 +101,7 @@
5 $DATE= RRDs::last "$data";
6 $version=&rrdtool_getversion();
7 print "RRDTool binary version detected : $version\n" if ($DEBUG);
8- if ($version=="1.2" || $version=="1.3") {
9+ if ($version>="1.2") {
10 $DATE= $DATE-300;
11 }
12 print "No date specified, last value will be read : ".scalar localtime($DATE)."\n" if ($DEBUG);

Subscribers

People subscribed via source and target branches