r573: * dh_md5sums: note that it's used by debsums. Closes: #181521

[debhelper.git] / Debian / Debhelper / Dh_Lib.pm

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index c9910bad9a826ea1a2ca2015a972fd1adfdd966c..41b7a6346882f0cfb2d1965f8686a3cc6f33ad81 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -117,7 +117,7 @@ sub escape_shell {
                        # This does make -V"foo bar" turn into "-Vfoo bar",
                        # but that will be parsed identically by the shell
                        # anyway..
-                       $word=~s/([\n`\$"\\])/\$1/g;
+                       $word=~s/([\n`\$"\\])/\\$1/g;
                        push @ret, "\"$word\"";
                }
                else {
@@ -439,7 +439,7 @@ sub addsubstvar {
        }
 
        if (length $line) {
-                complex_doit("(grep -s -v ${substvar} $substvarfile; echo '${substvar}=$line') > $substvarfile.new");
+                complex_doit("(grep -s -v ${substvar} $substvarfile; echo ".escape_shell("${substvar}=$line").") > $substvarfile.new");
                 doit("mv", "$substvarfile.new", $substvarfile);
        }
        else {