[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#791403: pu: ganglia-modules-linux/1.3.6-2



tags 791403 = jessie
stop

On 04/07/15 15:08, Adam D. Barratt wrote:
> user release.debian.org@packages.debian.org
> usertags 791403 = pu
> tags 791403 = jessie moreinfo
> thanks
> 
> On Sat, 2015-07-04 at 14:17 +0200, Daniel Pocock wrote:
>> Package: release.debian.org
>> User: release.debian.org@packages.debian.org
>> UserTags: unblock
>>
>>
>> This is a proposed upload to stable for jessie.
> 
> Then it's not an unblock request.
> 

Sorry about that, I had actually look at a couple of other bugs in the
BTS and they had unblock so I copied it.  I won't do it again.

>> It resolves a problem
>> that causes dist-upgrade to fail.
>>
>> Here is the patch that is added:
>>
>> https://anonscm.debian.org/cgit/pkg-monitoring/ganglia-modules-linux.git/commit/?id=29c5f380aa46d2b1b678a63c1daa5054d119f066
>>
>> and the changelog entry from the unstable upload:
>>
>> https://anonscm.debian.org/cgit/pkg-monitoring/ganglia-modules-linux.git/commit/?id=80641de7ace1a93adf02a9088f4da7c13d32d771
> 
> Neither of those is a debdiff of a package which has been built and
> tested on jessie, which is what is always requested for such updates.
> (See
> https://lists.debian.org/debian-devel-announce/2015/05/msg00005.html for
> example.)
> 

I didn't want to go to the effort of making a branch for jessie and
building it that way without getting some initial feedback that it may
be acceptable to the release team.  I am also keen to make sure I'm
really doing the right thing in postinst and postrm, I would welcome any
other opinions on that.

In any case, I've now gone and made a branch for jessie and built a
package, there is a debdiff attached

I looked at the email in that link, it mentions the +deb8u1 suffix.  If
the stable update is identical to the version that was uploaded to
unstable then is it necessary to use a suffix?

Regards,

Daniel

diff -Nru ganglia-modules-linux-1.3.6/debian/changelog ganglia-modules-linux-1.3.6/debian/changelog
--- ganglia-modules-linux-1.3.6/debian/changelog	2014-12-07 18:15:02.000000000 +0100
+++ ganglia-modules-linux-1.3.6/debian/changelog	2015-07-04 17:41:35.000000000 +0200
@@ -1,3 +1,9 @@
+ganglia-modules-linux (1.3.6-1+deb8u1) stable; urgency=medium
+
+  * Only restart service if already running. (Closes: #790951)
+
+ -- Daniel Pocock <daniel@pocock.pro>  Sat, 04 Jul 2015 17:38:20 +0200
+
 ganglia-modules-linux (1.3.6-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru ganglia-modules-linux-1.3.6/debian/postinst ganglia-modules-linux-1.3.6/debian/postinst
--- ganglia-modules-linux-1.3.6/debian/postinst	2012-04-10 17:57:22.000000000 +0200
+++ ganglia-modules-linux-1.3.6/debian/postinst	2015-07-04 17:37:02.000000000 +0200
@@ -20,11 +20,19 @@
 
 case "$1" in
     configure)
+        INIT_GMOND=/etc/init.d/ganglia-monitor
         if which invoke-rc.d >/dev/null 2>&1; then
-     		invoke-rc.d ganglia-monitor restart
+    		invoke-rc.d ganglia-monitor status >/dev/null 2>&1 && \
+     			invoke-rc.d ganglia-monitor restart
      	else
-     		/etc/init.d/ganglia-monitor restart
+        	[ -x ${INIT_GMOND} ] && \
+                	${INIT_GMOND} status >/dev/null 2>&1 && \
+                	${INIT_GMOND} restart
      	fi
+        # call `true' to conceal the return status of the gmond restart
+        # as we don't want an unrelated error in gmond to suggest
+        # that the dpkg operation has completely failed
+        true
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff -Nru ganglia-modules-linux-1.3.6/debian/postrm ganglia-modules-linux-1.3.6/debian/postrm
--- ganglia-modules-linux-1.3.6/debian/postrm	2012-04-21 15:40:20.000000000 +0200
+++ ganglia-modules-linux-1.3.6/debian/postrm	2015-07-04 17:37:02.000000000 +0200
@@ -22,18 +22,18 @@
 case "$1" in
     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
         INIT_GMOND=/etc/init.d/ganglia-monitor
-        if [ -x ${INIT_GMOND} ];
-        then
-           if which invoke-rc.d >/dev/null 2>&1; then
+        if which invoke-rc.d >/dev/null 2>&1; then
+	    invoke-rc.d ganglia-monitor status >/dev/null 2>&1 && \
                 invoke-rc.d ganglia-monitor restart
-           else
-                ${INIT_GMOND} restart
-           fi
-           # call `true' to conceal the return status of the gmond restart
-           # as we don't want an unrelated error in gmond to suggest
-           # that the dpkg operation has completely failed
-           true
+        else
+            [ -x ${INIT_GMOND} ] && \
+		${INIT_GMOND} status >/dev/null 2>&1 && \
+		${INIT_GMOND} restart
         fi
+        # call `true' to conceal the return status of the gmond restart
+        # as we don't want an unrelated error in gmond to suggest
+        # that the dpkg operation has completely failed
+        true
     ;;
 
     *)

Reply to: