[Initscripts-ng-commits] r1087 - in /trunk/src/insserv/debian: changelog patches/170_if-scope.patch patches/series

[pere at users.alioth.debian.org]

Author: pere
Date: Sat Feb  8 19:17:31 2014
New Revision: 1087

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1087
Log:
Fix code bug by adding new patch 170_if-scope.patch (Closes: #736479).
Patch based on suggestion from Howard Finer.

Added:
    trunk/src/insserv/debian/patches/170_if-scope.patch
Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/patches/series

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=1087&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog	(original)
+++ trunk/src/insserv/debian/changelog	Sat Feb  8 19:17:31 2014
@@ -2,6 +2,8 @@
 
   * Add Roger Leigh as uploader.
   * Move package into group maintenance by the pkg-sysvinit alioth group.
+  * Fix code bug by adding new patch 170_if-scope.patch (Closes: #736479).
+    Patch based on suggestion from Howard Finer.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 07 Feb 2014 21:24:18 +0100
 

Added: trunk/src/insserv/debian/patches/170_if-scope.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/170_if-scope.patch?rev=1087&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/170_if-scope.patch	(added)
+++ trunk/src/insserv/debian/patches/170_if-scope.patch	Sat Feb  8 19:17:31 2014
@@ -0,0 +1,24 @@
+Description: Fix if scope in code.
+Author: Petter Reinholdtsen <pere at debian.org>
+
+Origin: http://bugs.debian.org/736479
+Bug-Debian: http://bugs.debian.org/736479
+Forwarded: no
+Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
+Last-Update: 2014-02-08
+
+--- insserv-1.14.0.orig/insserv.c
++++ insserv-1.14.0/insserv.c
+@@ -3622,10 +3622,11 @@ int main (int argc, char *argv[])
+ 			serv->attr.flags &= ~SERV_ENABLED;
+ #  endif /* USE_KILL_IN_BOOT */
+ 		} else if (del && ignore) {
+-		    if (serv && (serv->attr.flags & SERV_ALREADY))
++		    if (serv && (serv->attr.flags & SERV_ALREADY)) {
+ 			xremove(dfd, d->d_name);
+ 			if (--serv->attr.ref <= 0)
+ 			    serv->attr.flags &= ~SERV_ENABLED;
++		    }
+ 		}
+ 	    }
+ 	}

Modified: trunk/src/insserv/debian/patches/series
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/series?rev=1087&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/series	(original)
+++ trunk/src/insserv/debian/patches/series	Sat Feb  8 19:17:31 2014
@@ -10,3 +10,4 @@
 140_debian_test_suite.patch
 150_core_string_test.patch
 160_manual_page_update.patch
+170_if-scope.patch