Просмотр исходного кода

dpkg: Use ohshit on bad version syntax in --compare-versions

Guillem Jover лет назад: 17
Родитель
Сommit
cc9fc4d628
2 измененных файлов с 5 добавлено и 10 удалено
  1. 1 0
      debian/changelog
  2. 4 10
      src/enquiry.c

+ 1 - 0
debian/changelog

@@ -47,6 +47,7 @@ dpkg (1.15.4) UNRELEASED; urgency=low
   * Allow quoting values in configuration file options.
   * Add new --pre-invoke and --post-invoke hooks in dpkg.
   * Add new --control-path command to dpkg-query.
+  * Use ohshit on bad version syntax in --compare-versions.
 
   [ Raphael Hertzog ]
   * Replace install-info by a wrapper around GNU's install-info. The wrapper

+ 4 - 10
src/enquiry.c

@@ -443,21 +443,15 @@ void cmpversions(const char *const *argv) {
 
   if (*argv[0] && strcmp(argv[0],"<unknown>")) {
     emsg= parseversion(&a,argv[0]);
-    if (emsg) {
-      printf(_("dpkg: version '%s' has bad syntax: %s\n"), argv[0], emsg);
-      m_output(stdout, _("<standard output>"));
-      exit(1);
-    }
+    if (emsg)
+      ohshit(_("version '%s' has bad syntax: %s"), argv[0], emsg);
   } else {
     blankversion(&a);
   }
   if (*argv[2] && strcmp(argv[2],"<unknown>")) {
     emsg= parseversion(&b,argv[2]);
-    if (emsg) {
-      printf(_("dpkg: version '%s' has bad syntax: %s\n"), argv[2], emsg);
-      m_output(stdout, _("<standard output>"));
-      exit(1);
-    }
+    if (emsg)
+      ohshit(_("version '%s' has bad syntax: %s"), argv[2], emsg);
   } else {
     blankversion(&b);
   }