Add --truename option.

diff --git a/ChangeLog b/ChangeLog
index cf72e99f1fc866e5d963b6dac89e9f1f89cdc5e9..c982d6580de06d4d2f3a667625ba1e32c1ed8501 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec 23 22:24:23 CST 2000 Adam Heath <doogie@debian.org>
+
+  * scripts/dpkg-divert.pl: Add --truename option.
+
 Sat Dec 23 21:40:32 CST 2000 Adam Heath <doogie@debian.org>
 
   * main/dpkg.8:  Document COLUMNS environment variable.

diff --git a/debian/changelog b/debian/changelog
index 1b1ac2e1d5ed7adbefc6adc22f00416194b649ab..9eca204e9aba1c94eaf8b13c5b1f96d7c8e553a0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 dpkg (1.8.0) unstable; urgency=low
 
+  * Add --truename option to dpkg-divert.  Closes: #68489.
   * Documented COLUMNS in dpkg(8).  Closes: #77001.
   * Modified DPKG_C_GCC_TRY_WARNS() to call AC_SUBST, so that we can
     use the result of the test during build time.  Closes: Bug#75138

diff --git a/scripts/dpkg-divert.8 b/scripts/dpkg-divert.8
index 3aebe9dc6adaa905ffc8c48b27d5e4be87e96db5..8140435985f3a69948623f2bb4b27c3cb9e2cad3 100644 (file)
--- a/scripts/dpkg-divert.8
+++ b/scripts/dpkg-divert.8
@@ -14,6 +14,10 @@ dpkg-divert -- override a package's version of a file
 [options]
 --list
 .I <glob-pattern>
+.B dpkg-divert
+[options] --truename
+.I <file>
+.br
 .SH DESCRIPTION
 File `diversions' are a way of forcing dpkg not to install a file into its
 location, but to a `diverted' location. Diversions can be used through the
@@ -26,7 +30,8 @@ contains those files.
 .B dpkg-divert
 is the utility used to set up and update the list of diversions. It
 functions in three basic modes - adding, removing, and listing diversions.
-The options are --add, --remove, and --list, respectively. Other options
+The options are --add, --remove, and --list, respectively. Additionally,
+it can print out the real name for a diverted file. Other options
 (listed below) may also be specified.
 .SH OPTIONS
 .TP

diff --git a/scripts/dpkg-divert.pl b/scripts/dpkg-divert.pl
index f176d8fb5f0228227cc94318f128f97ab92162be..310b867506d06396a3e19581a8f3b2b262f23159 100755 (executable)
--- a/scripts/dpkg-divert.pl
+++ b/scripts/dpkg-divert.pl
@@ -25,6 +25,7 @@ Usage:
  dpkg-divert [options] [--add] <file>               - add a diversion
  dpkg-divert [options] --remove <file>              - remove the diversion
  dpkg-divert [options] --list [<glob-pattern>]      - show file diversions
+ dpkg-divert [options] --truname <file>             - return the diverted file
 
 Options: 
     --package <package>        name of the package whose copy of <file>
@@ -82,6 +83,9 @@ while (@ARGV) {
     } elsif (m/^--list$/) {
         &checkmanymodes;
         $mode= 'list';
+    } elsif (m/^--truename$/) {
+        &checkmanymodes;
+        $mode= 'truename';
     } elsif (m/^--divert$/) {
         @ARGV || &badusage("--divert needs a divert-to argument");
         $divertto= shift(@ARGV);
@@ -177,6 +181,16 @@ if ($mode eq 'add') {
         print &infon($i),"\n";
     }
     exit(0);
+} elsif ($mode eq 'truename') {
+    @ARGV == 1 || &badusage("--truename needs a single argument");
+    $file= $ARGV[0];
+    for ($i=0; $i<=$#contest; $i++) {
+       next unless $file eq $contest[$i];
+       print $altname[$i], "\n";
+       exit(0);
+    }
+    print $file, "\n";
+    exit(0);
 } else {
     &quit("internal error - bad mode \`$mode'");
 }