Pārlūkot izejas kodu

Fix dpkg-query and dpkg-trigger to actually print a version on --version

Guillem Jover 16 gadi atpakaļ
vecāks
revīzija
88aa36dc99
3 mainītis faili ar 5 papildinājumiem un 2 dzēšanām
  1. 1 0
      debian/changelog
  2. 2 1
      src/query.c
  3. 2 1
      src/trigcmd.c

+ 1 - 0
debian/changelog

@@ -66,6 +66,7 @@ dpkg (1.15.6) UNRELEASED; urgency=low
   * Rename Dpkg::IPC::fork_and_exec() to Dpkg::IPC::spawn().
   * Change dpkg-dev to Depend on perl instead of perl5 and perl-modules.
   * Fix small memory leaks related to scandir() in dpkg-deb and libdpkg.
+  * Fix dpkg-query and dpkg-trigger to actually print a version on --version.
 
   [ Modestas Vainius ]
   * Implement symbol patterns (Closes: #563752). From now on, it is possible to

+ 2 - 1
src/query.c

@@ -559,7 +559,8 @@ control_path(const char *const *argv)
 static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *ci, const char *value)
 {
-  printf(_("Debian `%s' package management program query tool\n"), DPKGQUERY);
+  printf(_("Debian %s package management program query tool version %s.\n"),
+         DPKGQUERY, DPKG_VERSION_ARCH);
   printf(_(
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"

+ 2 - 1
src/trigcmd.c

@@ -48,7 +48,8 @@ const char printforhelp[] = N_(
 static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *ci, const char *value)
 {
-	printf(_("Debian %s package trigger utility.\n"), thisname);
+	printf(_("Debian %s package trigger utility version %s.\n"),
+	       thisname, DPKG_VERSION_ARCH);
 
 	printf(_(
 "This is free software; see the GNU General Public License version 2 or\n"