Comment 4 for bug 1522346

Revision history for this message
Robie Basak (racb) wrote :

Hi Louis,

Thank you for working on this merge. Good job identifying some changes that
could be dropped.

However I think this work could do with some improvement before I am happy to
upload it.

Overall it looks like it might be OK, but I'm concerned that the changelog is
misleading. There are changes that are being carried forward that are not
mentioned in your Remaining Changes section, and conversely there are also
changes that are claimed to have been carried forward but are partially
missing. Details below:

udev changes in debian/rules. Was this dropped? In your merge the delta still
seems to be there, and it still looks relevant. So why does the changelog say
that this is dropped?

Some but not all changes made in 2.7.1-1ubuntu5 seem to have disappeared. Are
they still needed? Why is this part of the delta not mentioned in the
changelog?

What about these parts of the previous delta, for which I don't see any
information in your merge changelog about whether these were carried forward or
dropped?

      * Disable systemd unit; it does not check nut.conf whether nut is
        configured, and thus fails to start (and the package install). The init.d
        script works well enough for the time being. (LP: #1313231)

      * debian/tests/test-nut.py: in the CVE_2012_2944 test, give nut at most 5
        seconds to shut down, instead of expecting it to be shut down immediately
        after sending the killall. (LP: #1291378)

      * debian/patches/0006-ups-conf-reorder.patch: Move maxretry setting
        above Examples section, closer to the "outside of a driver definition"
        comment. (LP: #1405822)

Please could you address these questions above? In particular I'd like the changelog to be accurate in explaining what is being carried forward, what is being dropped and any additional changes made (I think there are none in this case). Otherwise it's tough both to review now and for a future merge.

Minor: I'd put the extra Ubuntu delta lines for debian/patches/series after all
the Debian ones, unless there's a good reason to insert them into the middle.