Don't translate internal errors

diff --git a/ChangeLog b/ChangeLog
index 288f7651915adfbd7c2ed60640eea2dd2579755c..db070d20cc1ae04eb89508d9fc5937ba3097f8ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@ Sat Oct 30 03:31:30 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
   * Make it all build again
   * retro-actively add this ChangeLog entry
   * Removed bogus po/dpkg.po file
+  * No longer translater internal errors.. we want to see the English text
+    in bugreports
 
 Fri Oct 29 20:16:43 EDT 1999 Ben Collins <bcollins@debian.org>
 

diff --git a/dselect/main.cc b/dselect/main.cc
index d400655d2d707250378f953adcb00878be0ef7d7..6c44f58b6758265b0f459697f0f682d609f26b95 100644 (file)
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -273,7 +273,7 @@ urqresult urq_menu(void) {
       case urqr_fail:
         break;
       default:
-        internerr(_("unknown menufn"));
+        internerr("unknown menufn");
       }
       refreshmenu(); dme(cursor,1);
     } else if (c==C('l')) {

diff --git a/dselect/pkgcmds.cc b/dselect/pkgcmds.cc
index 4189b15aa3299046c4c8aba2b4ca4f7621971439..a2e9d2915472e075288a202664ca98796a6ce004 100644 (file)
--- a/dselect/pkgcmds.cc
+++ b/dselect/pkgcmds.cc
@@ -44,7 +44,7 @@ int packagelist::affectedmatches(struct pkginfo *pkg, struct pkginfo *comparewit
   case sso_unsorted:
     break;
   default:
-    internerr(_("unknown statsortorder in affectedmatches"));
+    internerr("unknown statsortorder in affectedmatches");
   }
   if (comparewith->priority != pkginfo::pri_unset &&
       (comparewith->priority != pkg->priority ||
@@ -157,7 +157,7 @@ void packagelist::kd_swapstatorder() {
   case sso_avail:     statsortorder= sso_state;     break;
   case sso_state:     statsortorder= sso_unsorted;  break;
   case sso_unsorted:  statsortorder= sso_avail;     break;
-  default: internerr(_("unknown statsort in kd_swapstatorder"));
+  default: internerr("unknown statsort in kd_swapstatorder");
   }
   resortredisplay();
 }
@@ -168,7 +168,7 @@ void packagelist::kd_swaporder() {
   case so_section:   sortorder= so_alpha;     break;
   case so_alpha:     sortorder= so_priority;  break;
   case so_unsorted:                           return;
-  default: internerr(_("unknown sort in kd_swaporder"));
+  default: internerr("unknown sort in kd_swaporder");
   }
   resortredisplay();
 }
@@ -204,7 +204,7 @@ void packagelist::kd_versiondisplay() {
   case vdo_both:       versiondisplayopt= vdo_none;       break;
   case vdo_none:       versiondisplayopt= vdo_available;  break;
   case vdo_available:  versiondisplayopt= vdo_both;       break;
-  default: internerr(_("unknown versiondisplayopt in kd_versiondisplay"));
+  default: internerr("unknown versiondisplayopt in kd_versiondisplay");
   }
   setwidths();
   leftofscreen= 0;

diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc
index 51f063b7a1edae94f7a249bd845304ce52828b13..7603980de2835f2038eadecf8063faaf5d3a4056 100644 (file)
--- a/dselect/pkgdepcon.cc
+++ b/dselect/pkgdepcon.cc
@@ -331,7 +331,7 @@ int packagelist::resolvedepcon(dependency *depends) {
     return 0;
     
   default:
-    internerr(_("unknown deptype"));
+    internerr("unknown deptype");
   }
   /* never reached, make gcc happy */
   return 1;

diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc
index e6de72eefb9f4802acddd9b8cdd1e2dd8c9c16d9..b206bd3840fe4465c2961af0b447e9d0b775c11c 100644 (file)
--- a/dselect/pkgdisplay.cc
+++ b/dselect/pkgdisplay.cc
@@ -178,7 +178,7 @@ void packagelist::setwidths() {
     description_column= versionavailable_column + versionavailable_width + gap_width;
     break;
   default:
-    internerr(_("unknown versiondisplayopt in setwidths"));
+    internerr("unknown versiondisplayopt in setwidths");
   }
     
   total_width= TOTAL_LIST_WIDTH;
@@ -210,7 +210,7 @@ void packagelist::redrawtitle() {
           waddnstr(titlewin, _(" (status, section)"), xmax-x);
           break;
         default:
-          internerr(_("bad statsort in redrawtitle/so_section"));
+          internerr("bad statsort in redrawtitle/so_section");
         }
         break;
       case so_priority:
@@ -225,7 +225,7 @@ void packagelist::redrawtitle() {
           waddnstr(titlewin, _(" (status, priority)"), xmax-x);
           break;
         default:
-          internerr(_("bad statsort in redrawtitle/so_priority"));
+          internerr("bad statsort in redrawtitle/so_priority");
         }
         break;
       case so_alpha:
@@ -240,7 +240,7 @@ void packagelist::redrawtitle() {
           waddnstr(titlewin, _(" (by status)"), xmax-x);
           break;
         default:
-          internerr(_("bad statsort in redrawtitle/so_priority"));
+          internerr("bad statsort in redrawtitle/so_priority");
         }
         break;
         waddnstr(titlewin, _(" (alphabetically)"), xmax-x);
@@ -248,7 +248,7 @@ void packagelist::redrawtitle() {
       case so_unsorted:
         break;
       default:
-        internerr(_("bad sort in redrawtitle"));
+        internerr("bad sort in redrawtitle");
       }
     }
     const char *helpstring= readwrite ? (verbose ? _(" mark:+/=/- terse:v help:?")

diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc
index 1826ed4f877cfde92ce1b17abcfe52d0ee99a6f0..c429983cd015c35ce2fe12d823c719e8f4c49d19 100644 (file)
--- a/dselect/pkglist.cc
+++ b/dselect/pkglist.cc
@@ -45,7 +45,7 @@ int packagelist::compareentries(struct perpackagestate *a,
   case sso_unsorted:
     break;
   default:
-    internerr(_("unknown statsortorder in compareentries"));
+    internerr("unknown statsortorder in compareentries");
   }
 
   const char *asection= a->pkg->section;
@@ -76,7 +76,7 @@ int packagelist::compareentries(struct perpackagestate *a,
     return c_name;
   case so_unsorted:
   default:
-    internerr(_("unsorted or unknown in compareentries"));
+    internerr("unsorted or unknown in compareentries");
   }
   /* never reached, make gcc happy */
   return 1;
@@ -204,7 +204,7 @@ void packagelist::ensurestatsortinfo() {
         }
         break;
       default:
-        internerr(_("unknown stat in ensurestatsortinfo sso_avail"));
+        internerr("unknown stat in ensurestatsortinfo sso_avail");
       }
       if (debug)
         fprintf(debug,"packagelist[%p]::ensurestatsortinfos() i=%d ssavail=%d\n",
@@ -237,7 +237,7 @@ void packagelist::ensurestatsortinfo() {
         table[index]->ssstate= sss_installed;
         break;
       default:
-        internerr(_("unknown stat in ensurestatsortinfo sso_state"));
+        internerr("unknown stat in ensurestatsortinfo sso_state");
       }
       if (debug)
         fprintf(debug,"packagelist[%p]::ensurestatsortinfos() i=%d ssstate=%d\n",
@@ -247,7 +247,7 @@ void packagelist::ensurestatsortinfo() {
     calcsssdone= 1;
     break;
   default:
-    internerr(_("unknown statsortorder in ensurestatsortinfo"));
+    internerr("unknown statsortorder in ensurestatsortinfo");
   }
 }
 

diff --git a/dselect/pkgsublist.cc b/dselect/pkgsublist.cc
index 9817803ee7d287a368c7a646af10ba0034f1d203..fb2bfb2466aed661ef417205adb8689096dd75df 100644 (file)
--- a/dselect/pkgsublist.cc
+++ b/dselect/pkgsublist.cc
@@ -129,7 +129,7 @@ int packagelist::add(dependency *depends, showpriority displayimportance) {
       case dvr_earlierstrict: info(" (<< "); break;
       case dvr_laterstrict:   info(" (>> "); break;
       case dvr_exact:         info(" (= "); break;
-      default: internerr(_("unknown verrel"));
+      default: internerr("unknown verrel");
       }
       info(versiondescribe(&possi->version,vdew_never));
       info(")");

diff --git a/dselect/pkgtop.cc b/dselect/pkgtop.cc
index ba609505474bb46e91ec9bc056faa818575600aa..e984b3097822141cb131e0295c6d13a18b4ed70a 100644 (file)
--- a/dselect/pkgtop.cc
+++ b/dselect/pkgtop.cc
@@ -70,7 +70,7 @@ int packagelist::describemany(char buf[], const char *prioritystring,
   case sso_unsorted:
     break;
   default:
-    internerr(_("unknown statsortrder in describemany all"));
+    internerr("unknown statsortrder in describemany all");
   }
   
   if (!prioritystring) {

diff --git a/lib/dbmodify.c b/lib/dbmodify.c
index 9d9c41de35a73cfe39cb7bb24400e11eaa1ce219..eb34c0c4879e89a0efcee3afd0dec9778bfb6bfb 100644 (file)
--- a/lib/dbmodify.c
+++ b/lib/dbmodify.c
@@ -159,7 +159,7 @@ enum modstatdb_rw modstatdb_init(const char *adir, enum modstatdb_rw readwritere
   case msdbrw_readonly:
     cstatus= msdbrw_readonly; break;
   default:
-    internerr(_("unknown readwritereq"));
+    internerr("unknown readwritereq");
   }
 
   updatefnbuf= m_malloc(strlen(adir)+sizeof(UPDATESDIR)+IMPORTANTMAXLEN+5);

diff --git a/lib/parsehelp.c b/lib/parsehelp.c
index 5c1456eed4daae6ed3c624fe59b8c7070a461291..7999c8cf7ffe40fa79af1318b3122b7950fb7127 100644 (file)
--- a/lib/parsehelp.c
+++ b/lib/parsehelp.c
@@ -159,7 +159,7 @@ void varbufversion
     varbufprintf(vb,"%lu:",version->epoch);
     break;
   default:
-    internerr(_("bad versiondisplayepochwhen in varbufversion"));
+    internerr("bad versiondisplayepochwhen in varbufversion");
   }
   if (version->version) varbufaddstr(vb,version->version);
   if (version->revision && *version->revision) {

diff --git a/lib/vercmp.c b/lib/vercmp.c
index dfdc2d23f00b7d7a7fddb67ba459d0f6043df280..fecc74562ad1a9361776fa8c0f1f1585cbb09b7a 100644 (file)
--- a/lib/vercmp.c
+++ b/lib/vercmp.c
@@ -83,7 +83,7 @@ int versionsatisfied3(const struct versionrevision *it,
   case dvr_earlierstrict:  return r < 0;
   case dvr_laterstrict:    return r > 0;
   case dvr_exact:          return r == 0;
-  default:                 internerr(_("unknown verrel"));
+  default:                 internerr("unknown verrel");
   }
 }
 

diff --git a/main/archives.c b/main/archives.c
index d035c05e736bcab2100fa9a8f8635393fe419126..523806b453e0993dd578ed0e26e7ff3a052d5f40 100644 (file)
--- a/main/archives.c
+++ b/main/archives.c
@@ -465,7 +465,7 @@ int tarobject(struct TarInfo *ti) {
     newtarobject_allmodes(fnamenewvb.buf,ti);
     break;
   default:
-    internerr(_("bad tar type, but already checked"));
+    internerr("bad tar type, but already checked");
   }
   /*
    * Now we have extracted the new object in .dpkg-new (or, if the
@@ -821,7 +821,7 @@ void archivefiles(const char *const *argv) {
   case act_avail:
     break;
   default:
-    internerr(_("unknown action"));
+    internerr("unknown action");
   }
 
   modstatdb_shutdown();

diff --git a/main/configure.c b/main/configure.c
index 1824307f3dab44d88484f6de564b8f285e0b7d03..694a8365c960d79f46c15ee1d9c740b1552160d0 100644 (file)
--- a/main/configure.c
+++ b/main/configure.c
@@ -363,7 +363,7 @@ void deferred_configure(struct pkginfo *pkg) {
         switch (cc) {
         case 'i': case 'y':  what= cfof_install | cfof_backup;   break;
         case 'n': case 'o':  what= cfof_keep    | cfof_backup;   break;
-        default:             internerr(_("unknown response"));
+        default:             internerr("unknown response");
         }
 
       }
@@ -418,7 +418,7 @@ void deferred_configure(struct pkginfo *pkg) {
         break;
 
       default:
-        internerr(_("unknown what"));
+        internerr("unknown what");
       }
 
       conff->hash= nfstrsave(newdisthash);

diff --git a/main/depcon.c b/main/depcon.c
index 7ada4380077912d30f52a597b89ac470b33d58dd..47fe362e5f6500b9f16ef75f63104aec895cbbfa 100644 (file)
--- a/main/depcon.c
+++ b/main/depcon.c
@@ -133,7 +133,7 @@ void describedepcon(struct varbuf *addto, struct dependency *dep) {
   case dep_predepends:  varbufaddstr(addto, _(" pre-depends on ")); break;
   case dep_recommends:  varbufaddstr(addto, _(" recommends "));     break;
   case dep_conflicts:   varbufaddstr(addto, _(" conflicts with ")); break;
-  default:              internerr(_("unknown deptype"));
+  default:              internerr("unknown deptype");
   }
   varbufdependency(addto, dep);
 }
@@ -179,13 +179,13 @@ int depisok(struct dependency *dep, struct varbuf *whynot,
     case stat_halfconfigured: case stat_unpacked:
       return 1;
     default:
-      internerr(_("unknown status depending"));
+      internerr("unknown status depending");
     }
     break;
   case itb_installnew: case itb_preinstall:
     break;
   default:
-    internerr(_("unknown istobe depending"));
+    internerr("unknown istobe depending");
   }
 
   /* Describe the dependency, in case we have to moan about it. */
@@ -261,7 +261,7 @@ int depisok(struct dependency *dep, struct varbuf *whynot,
         }
         break;
       default:
-        internerr(_("unknown istobe depended"));
+        internerr("unknown istobe depended");
       }
       varbufaddstr(whynot, linebuf);
 
@@ -305,7 +305,7 @@ int depisok(struct dependency *dep, struct varbuf *whynot,
                     gettext(statusstrings[provider->up->up->status]));
             break;
           default:
-            internerr(_("unknown istobe provider"));
+            internerr("unknown istobe provider");
           }
           varbufaddstr(whynot, linebuf);
         }
@@ -370,7 +370,7 @@ int depisok(struct dependency *dep, struct varbuf *whynot,
         }
         break;
       default:
-        internerr(_("unknown istobe conflict"));
+        internerr("unknown istobe conflict");
       }
     }
 
@@ -426,7 +426,7 @@ int depisok(struct dependency *dep, struct varbuf *whynot,
           }
           break;
         default:
-          internerr(_("unknown istobe conflict provider"));
+          internerr("unknown istobe conflict provider");
         }
       }
     }

diff --git a/main/enquiry.c b/main/enquiry.c
index ccc1332e880f7e527802fa44432ed9d76be9856e..bbe154cec262ddccce378ac0bc640bf997858e1c 100644 (file)
--- a/main/enquiry.c
+++ b/main/enquiry.c
@@ -221,7 +221,7 @@ static int yettobeunpacked(struct pkginfo *pkg, const char **thissect) {
       *thissect= pkg->section && *pkg->section ? pkg->section : _("<unknown>");
     return 1;
   default:
-    internerr(_("unknown status checking for unpackedness"));
+    internerr("unknown status checking for unpackedness");
   }
 }
 
@@ -453,7 +453,7 @@ void enqperpackage(const char *const *argv) {
       break;
 
     default:
-      internerr(_("unknown action"));
+      internerr("unknown action");
     }
         
     putchar('\n');
@@ -676,7 +676,7 @@ void printarch(const char *const *argv) {
   switch (cipaction->arg) {
   case act_printarch:    arch= archp->to;  break;
   case act_printgnuarch: arch= archp->gnu; break;
-  default: internerr(_("unknown action in printarch"));
+  default: internerr("unknown action in printarch");
   }
   if (!arch) {
     *q= 0; arch= p;

diff --git a/main/filesdb.c b/main/filesdb.c
index 4efe05fa8a32ffafcd37a22997eeb6b0916ce8e9..f83617be265d08f0c04256333edd39a13c3f5ef4 100644 (file)
--- a/main/filesdb.c
+++ b/main/filesdb.c
@@ -460,7 +460,7 @@ struct fileiterator *iterfilestart(void) {
     i->u.low.current= allfiles;
     break;
   default:
-    internerr(_("iterfilestart no f_largemem"));
+    internerr("iterfilestart no f_largemem");
   }
   return i;
 }
@@ -482,7 +482,7 @@ struct filenamenode *iterfilenext(struct fileiterator *i) {
     i->u.low.current= i->u.low.current->next;
     break;
   default:
-    internerr(_("iterfilenext no f_largemem"));
+    internerr("iterfilenext no f_largemem");
   }
   return r;
 }
@@ -528,7 +528,7 @@ void filesdbinit(void) {
     }
     break;
   default:
-    internerr(_("filesdbinit no f_largemem"));
+    internerr("filesdbinit no f_largemem");
   }    
 }
 
@@ -542,7 +542,7 @@ struct filenamenode *findnamenode(const char *name) {
   case -1:
     return findnamenode_low(name);
   default:
-    internerr(_("findnamenode no f_largemem"));
+    internerr("findnamenode no f_largemem");
   }
 }
 

diff --git a/main/packages.c b/main/packages.c
index b915f39661f9cf69c4e1c9474ebadbfe1fcd3ca5..0cb6aaaa3dafaa054642b50c3fcc4dc7c93c6a77 100644 (file)
--- a/main/packages.c
+++ b/main/packages.c
@@ -97,7 +97,7 @@ void packages(const char *const *argv) {
           continue;
         break;
       default:
-        internerr(_("unknown action for pending"));
+        internerr("unknown action for pending");
       }
       add_to_queue(pkg);
     }
@@ -139,7 +139,7 @@ void process_queue(void) {
   switch (cipaction->arg) {
   case act_configure: case act_install:  istobe= itb_installnew;  break;
   case act_remove: case act_purge:       istobe= itb_remove;      break;
-  default: internerr(_("unknown action for queue start"));
+  default: internerr("unknown action for queue start");
   }
   for (rundown= queuehead; rundown; rundown= rundown->next) {
     ensure_package_clientdata(rundown->pkg);
@@ -156,7 +156,7 @@ void process_queue(void) {
                rundown->pkg->name);
         break;
       default:
-        internerr(_("unknown action in duplicate"));
+        internerr("unknown action in duplicate");
       }
       rundown->pkg= 0;
    } else {
@@ -199,7 +199,7 @@ void process_queue(void) {
       deferred_remove(pkg);
       break;
     default:
-      internerr(_("unknown action in queue"));
+      internerr("unknown action in queue");
     }
     if (ferror(stdout)) werr("stdout");
     if (ferror(stderr)) werr("stderr");
@@ -402,7 +402,7 @@ int dependencies_ok(struct pkginfo *pkg, struct pkginfo *removing,
     case 3:
       break;
     default:
-      internerr(_("unknown value for found"));
+      internerr("unknown value for found");
     }
   }
   if (ok == 0 && (pkg->clientdata && pkg->clientdata->istobe == itb_remove))

diff --git a/main/update.c b/main/update.c
index 100bead138f37b5d506784a4a906c9ffbe42fc76..797d519ff75fa0a17a724212b5e3f4b8b8d828f3 100644 (file)
--- a/main/update.c
+++ b/main/update.c
@@ -48,7 +48,7 @@ void updateavailable(const char *const *argv) {
       badusage(_("--%s needs exactly one Packages file argument"),cipaction->olong);
     break;
   default:
-    internerr(_("bad cipaction->arg in updateavailable"));
+    internerr("bad cipaction->arg in updateavailable");
   }
   
   if (!f_noact) {
@@ -71,7 +71,7 @@ void updateavailable(const char *const *argv) {
   case act_avclear:
     break;
   default:
-    internerr(_("bad cipaction->arg in update available"));
+    internerr("bad cipaction->arg in update available");
   }
 
   varbufaddstr(&vb,admindir);