The following commit has been merged in the master branch:
commit cdc1ff8459094d48608dfdabbe5f43587eaa5c6a
Author: Guillem Jover <[email protected]>
Date:   Sun Sep 27 14:31:36 2009 +0200

    dpkg-trigger: On --help print the default admindir
    
    Instead of the one passed on the command line.

diff --git a/debian/changelog b/debian/changelog
index 7c0d3c0..04ef0ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ dpkg (1.15.5) UNRELEASED; urgency=low
     finishing fatally.
   * Update md5 file paths in debian/copyright.
     Thanks to Jonathan Nieder <[email protected]>.
+  * On ‘dpkg-trigger --help’ print the default admindir instead of the one
+    passed on the command line.
 
   [ Raphaël Hertzog ]
   * Add versioned dependency on base-files (>= 5.0.0) to dpkg-dev to ensure
diff --git a/src/trigcmd.c b/src/trigcmd.c
index 3fd7d07..9e09810 100644
--- a/src/trigcmd.c
+++ b/src/trigcmd.c
@@ -111,7 +111,7 @@ usage(void)
 "                                     by dpkg).\n"
 "  --no-await                       No package needs to await the 
processing.\n"
 "  --no-act                         Just test - don't actually change 
anything.\n"
-"\n"), admindir);
+"\n"), ADMINDIR);
 
        m_output(stdout, _("<standard output>"));
 }

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to