Selaa lähdekoodia

dpkg-shlibdeps: Say substvars instead of varlist in error messages

Guillem Jover 11 vuotta sitten
vanhempi
commit
15c0c84299
2 muutettua tiedostoa jossa 4 lisäystä ja 2 poistoa
  1. 1 0
      debian/changelog
  2. 3 2
      scripts/dpkg-shlibdeps.pl

+ 1 - 0
debian/changelog

@@ -151,6 +151,7 @@ dpkg (1.18.0) UNRELEASED; urgency=low
     - Consistently use proper quotation marks ("" or '', and not the
       unbalanced `' pair) all over the place.
     - Use syserr() instead of an ad-hoc error message in dpkg-scansources.
+    - Say substvars instead of varlist in dpkg-shlibdeps error messages.
 
   [ Raphaël Hertzog ]
   * Drop myself from Uploaders.

+ 3 - 2
scripts/dpkg-shlibdeps.pl

@@ -455,11 +455,12 @@ if ($stdout) {
         or syserr(g_("open new substvars file '%s'"), "$varlistfile.new");
     if (-e $varlistfile) {
 	open(my $old_fh, '<', $varlistfile)
-	    or syserr(g_("open old varlist file '%s' for reading"), $varlistfile);
+	    or syserr(g_("open old substvars file '%s' for reading"),
+	              $varlistfile);
 	while (my $entry = <$old_fh>) {
 	    next if $entry =~ m/^\Q$varnameprefix\E:/;
 	    print { $new_fh } $entry
-	        or syserr(g_("copy old entry to new varlist file '%s'"),
+	        or syserr(g_("copy old entry to new substvars file '%s'"),
 	                  "$varlistfile.new");
 	}
 	close($old_fh);