The following commit has been merged in the master branch:
commit 8e70b9b2f9d16010c614496c0f8f7e9a0d6ced15
Author: Modestas Vainius <[email protected]>
Date: Mon Jun 29 00:18:17 2009 +0300
dpkg-gensymbols: improve diff label again.
Use "$source_file ($package $arch)".
Signed-off-by: Modestas Vainius <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 92b3d9d..23e0f5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,9 @@ dpkg (1.15.4) UNRELEASED; urgency=low
sub-directories. Closes: #535138
* Upgrade Standards-Version to 3.8.2 (no changes).
+ [ Modestas Vainius ]
+ * Provide a meaningful label for dpkg-gensymbols diff.
+
[ Updated dpkg translations ]
* Asturian (Marcos Alvarez Costales). Closes: #535327
* French (Christian Perrier).
diff --git a/scripts/dpkg-gensymbols.pl b/scripts/dpkg-gensymbols.pl
index 2ff432d..3c67d1e 100755
--- a/scripts/dpkg-gensymbols.pl
+++ b/scripts/dpkg-gensymbols.pl
@@ -276,7 +276,10 @@ if ($compare) {
$output);
}
my ($a, $b) = ($before->filename, $after->filename);
- system("diff", "-u", "-L",
"dpkg-gensymbols_${oppackage}_${host_arch}", $a, $b) if -x "/usr/bin/diff";
+ my $diff_label = sprintf("%s (%s %s)",
+ ($ref_symfile->{file}) ? $ref_symfile->{file} : "new_symbol_file",
+ $oppackage, $host_arch);
+ system("diff", "-u", "-L", $diff_label, $a, $b) if -x
"/usr/bin/diff";
}
}
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
