From: Wichert Akkerman Date: Sat, 30 Oct 1999 01:44:55 +0000 (+0000) Subject: Don't translate internal errors X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdde1cb6620caddc36ad6ca2ab17d5dd51088524;p=dpkg Don't translate internal errors --- diff --git a/ChangeLog b/ChangeLog index 288f7651..db070d20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ Sat Oct 30 03:31:30 CEST 1999 Wichert Akkerman * 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 diff --git a/dselect/main.cc b/dselect/main.cc index d400655d..6c44f58b 100644 --- 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 4189b15a..a2e9d291 100644 --- 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 51f063b7..7603980d 100644 --- 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 e6de72ee..b206bd38 100644 --- 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 1826ed4f..c429983c 100644 --- 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 9817803e..fb2bfb24 100644 --- 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 ba609505..e984b309 100644 --- 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 9d9c41de..eb34c0c4 100644 --- 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 5c1456ee..7999c8cf 100644 --- 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 dfdc2d23..fecc7456 100644 --- 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 d035c05e..523806b4 100644 --- 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 1824307f..694a8365 100644 --- 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 7ada4380..47fe362e 100644 --- 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 ccc1332e..bbe154ce 100644 --- 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 : _(""); 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 4efe05fa..f83617be 100644 --- 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 b915f396..0cb6aaaa 100644 --- 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 100bead1..797d519f 100644 --- 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);