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

Errors during dpkg -s(and other similiar commands) are now printed on
stderr.

Adam Heath лет назад: 25
Родитель
Сommit
128a4d7d67
3 измененных файлов с 12 добавлено и 5 удалено
  1. 5 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 5 5
      main/enquiry.c

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+Thu Apr 19 00:14:39 CDT 2001 Adam Heath <doogie@debian.org>
+
+  * main/enquiry.c: Errors during dpkg -s(and other similiar commands) are
+    now printed on stderr.
+
 Thu Apr 19 00:03:16 CDT 2001 Adam Heath <doogie@debian.org>
 
   * main/archives.c:  Apply patch from Fumitoshi UKAI <ukai@debian.or.jp>,

+ 2 - 0
debian/changelog

@@ -60,6 +60,8 @@ dpkg (1.9.0) unstable; urgency=low
     segfaults people have been seeing in dpkg.  Closes: #90328.
   * Apply patch from bug#86847, that escapes intl chars in filenames.
     Closes(rc): #83752, #85040, #86847, #89000.
+  * Errors during dpkg -s(and other similiar commands) are now printed
+    on stderr.  Closes: #88987.
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

+ 5 - 5
main/enquiry.c

@@ -446,7 +446,7 @@ void enqperpackage(const char *const *argv) {
           !pkg->files &&
           pkg->want == want_unknown &&
           !informative(pkg,&pkg->installed)) {
-        printf(_("Package `%s' is not installed and no info is available.\n"),pkg->name);
+        fprintf(stderr,_("Package `%s' is not installed and no info is available.\n"),pkg->name);
         failures++;
       } else {
         writerecord(stdout, "<stdout>", pkg, &pkg->installed);
@@ -455,7 +455,7 @@ void enqperpackage(const char *const *argv) {
 
     case act_printavail:
       if (!informative(pkg,&pkg->available)) {
-        printf(_("Package `%s' is not available.\n"),pkg->name);
+        fprintf(stderr,_("Package `%s' is not available.\n"),pkg->name);
         failures++;
       } else {
         writerecord(stdout, "<stdout>", pkg, &pkg->available);
@@ -465,7 +465,7 @@ void enqperpackage(const char *const *argv) {
     case act_listfiles:
       switch (pkg->status) {
       case stat_notinstalled: 
-        printf(_("Package `%s' is not installed.\n"),pkg->name);
+        fprintf(stderr,_("Package `%s' is not installed.\n"),pkg->name);
         failures++;
         break;
         
@@ -501,8 +501,8 @@ void enqperpackage(const char *const *argv) {
   }
 
   if (failures) {
-    puts(_("Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-         "and dpkg --contents (= dpkg-deb --contents) to list their contents."));
+    fputs(_("Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+         "and dpkg --contents (= dpkg-deb --contents) to list their contents."),stderr);
     if (ferror(stdout)) werr("stdout");
   }
 }