[Initscripts-ng-commits] r991 - in /trunk/src/insserv/debian: changelog check-initd-order

[pere at users.alioth.debian.org]

Author: pere
Date: Tue Sep  8 21:33:59 2009
New Revision: 991

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=991
Log:
Make sure check-initd-order generated valid dotty files when
scripts provide strings with " in them (Closes: #545521).  Thanks
to Laurent Bonnaud for discovering the problem.

Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/check-initd-order

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=991&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Tue Sep  8 21:33:59 2009
@@ -3,6 +3,9 @@
   * Use dh_lintian during build.  Depend on debhelper (>= 6.0.7) for this.
   * Correct wiki URL in README.Debian (Closes: #545171).  Thanks to
     Josh Triplett for noticing the old URL.
+  * Make sure check-initd-order generated valid dotty files when
+    scripts provide strings with " in them (Closes: #545521).  Thanks
+    to Laurent Bonnaud for discovering the problem.
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 08 Sep 2009 08:51:43 +0200
 

Modified: trunk/src/insserv/debian/check-initd-order
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/check-initd-order?rev=991&op=diff
==============================================================================
--- trunk/src/insserv/debian/check-initd-order (original)
+++ trunk/src/insserv/debian/check-initd-order Tue Sep  8 21:33:59 2009
@@ -145,6 +145,7 @@
     }
 
     for my $provide (@provides) {
+        my $provideesc = $provide; $provideesc =~ s/"/\\"/g;
         my %deps =
             (
              "required-$key" => 'blue',
@@ -162,19 +163,20 @@
                 }
 
                 for my $pkg (@depends) {
+                    my $pkgesc = $pkg; $pkgesc =~ s/"/\\"/g;
                     my $color = $deps{$key};
                     if ($revkey eq $key) {
-                        print "\"$provide\" -> \"$pkg\"[color=$color] ;\n";
+                        print "\"$provideesc\" -> \"$pkgesc\"[color=$color] ;\n";
                         $gotrevdeps{$pkg} = 1 unless $dependonall;
                     } else {
-                        print "\"$pkg\" -> \"$provide\"[color=$color] ;\n";
+                        print "\"$pkgesc\" -> \"$provideesc\"[color=$color] ;\n";
                         $gotrevdeps{$provide} = 1 unless $dependonall;
                     }
                 }
             }
         }
 
-        print "\"$provide\" [shape=box];\n" unless $allprovides{$provide};
+        print "\"$provideesc\" [shape=box];\n" unless $allprovides{$provide};
         $allprovides{$provide} = 1;
     }
 }