Przeglądaj źródła

s/--cmpversions/--compare-versions/

Adam Heath 25 lat temu
rodzic
commit
668c11b340
4 zmienionych plików z 11 dodań i 5 usunięć
  1. 4 0
      ChangeLog
  2. 1 0
      debian/changelog
  3. 2 2
      main/enquiry.c
  4. 4 3
      po/dpkg.pot

+ 4 - 0
ChangeLog

@@ -1,3 +1,7 @@
+Thu Dec 21 03:35:56 CST 2000 Adam Heath <doogie@debian.org>
+
+  * main/enquiry.c: s/--cmpversions/--compare-versions/
+
 Thu Dec 21 03:29:04 CST 2000 Adam Heath <doogie@debian.org>
 
   * main/dpkg.8: Remove duplicate -R(it doesn't set --root).

+ 1 - 0
debian/changelog

@@ -1,5 +1,6 @@
 dpkg (1.8.0) unstable; urgency=low
 
+  * Fix typo in --compare-versions error message.  Closes: Bug#66474.
   * -R doesn't mean --root.  Closes: Bug#66068, #72013
   * Add armv3l to archtable.  Closes: Bug#72125
   * Fix two memory leaks, and lesson the memory foot print a tad.  Hints

+ 2 - 2
main/enquiry.c

@@ -761,12 +761,12 @@ void cmpversions(const char *const *argv) {
   int r;
   
   if (!argv[0] || !argv[1] || !argv[2] || argv[3])
-    badusage(_("--cmpversions takes three arguments:"
+    badusage(_("--compare-versions takes three arguments:"
              " <version> <relation> <version>"));
 
   for (rip=relationinfos; rip->string && strcmp(rip->string,argv[1]); rip++);
 
-  if (!rip->string) badusage(_("--cmpversions bad relation"));
+  if (!rip->string) badusage(_("--compare-versions bad relation"));
 
   if (*argv[0] && strcmp(argv[0],"<unknown>")) {
     emsg= parseversion(&a,argv[0]);

+ 4 - 3
po/dpkg.pot

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-21 01:36-0600\n"
+"POT-Creation-Date: 2000-12-21 03:34-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1672,11 +1672,12 @@ msgid "dpkg: warning, architecture `%s' not in remapping table\n"
 msgstr ""
 
 #: main/enquiry.c:764
-msgid "--cmpversions takes three arguments: <version> <relation> <version>"
+msgid ""
+"--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr ""
 
 #: main/enquiry.c:769
-msgid "--cmpversions bad relation"
+msgid "--compare-versions bad relation"
 msgstr ""
 
 #: main/enquiry.c:774