From: Wichert Akkerman Date: Sat, 10 Mar 2001 00:47:25 +0000 (+0000) Subject: add --no-debsign option to dpkg X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0217a574853c471ff9d1db8ed81822834bbe4230;p=dpkg add --no-debsign option to dpkg --- diff --git a/ChangeLog b/ChangeLog index 2fa5fe4d..55d38134 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Mar 10 01:33:15 CET 2001 Wichert Akkerman + + * main/main,h, main/main.c: add --no-debsig option using f_nodebsign + * main/processarc: don't check signatures of f_nodebsign is set + Fri Mar 9 21:23:03 CET 2001 Wichert Akkerman * include/dpkg.h.in: add DEBSIGVERIFY diff --git a/main/main.c b/main/main.c index f14f78c2..2bf46d7f 100644 --- a/main/main.c +++ b/main/main.c @@ -97,6 +97,7 @@ Options:\n\ -E|--skip-same-version Skip packages whose same version is installed\n\ -G|--refuse-downgrade Skip packages with earlier version than installed\n\ -B|--auto-deconfigure Install even if it would break some other package\n\ + --no-debsign Do no try to verify package signatures\n\ --no-act Just say what we would do - don't do it\n\ -D|--debug= Enable debugging - see -Dhelp or --debug=help\n\ --status-fd Send status change updates to file descriptor \n\ @@ -128,7 +129,7 @@ Options marked [*] produce a lot of output - pipe it through `less' or `more' !" const struct cmdinfo *cipaction= 0; int f_pending=0, f_recursive=0, f_alsoselect=1, f_skipsame=0, f_noact=0; -int f_autodeconf=0; +int f_autodeconf=0, f_nodebsig=0; unsigned long f_debug=0; /* Change fc_overwrite to 1 to enable force-overwrite by default */ int fc_downgrade=1, fc_configureany=0, fc_hold=0, fc_removereinstreq=0, fc_overwrite=0; @@ -391,6 +392,7 @@ static const struct cmdinfo cmdinfos[]= { { "pending", 'a', 0, &f_pending, 0, 0, 1 }, { "recursive", 'R', 0, &f_recursive, 0, 0, 1 }, { "no-act", 0, 0, &f_noact, 0, 0, 1 }, + { "no-debsig", 0, 0, &f_nodebsig, 0, 0, 1 }, { 0, 'G', 0, &fc_downgrade, 0, 0, /* alias for --refuse */ 0 }, { "selected-only", 'O', 0, &f_alsoselect, 0, 0, 0 }, { "no-also-select", 'N', 0, &f_alsoselect, 0,0,0 /* fixme: remove sometime */ }, diff --git a/main/main.h b/main/main.h index 33010c04..75c63c59 100644 --- a/main/main.h +++ b/main/main.h @@ -79,7 +79,7 @@ extern const char *const statusstrings[]; extern const struct cmdinfo *cipaction; extern int f_pending, f_recursive, f_alsoselect, f_skipsame, f_noact; -extern int f_autodeconf, f_largemem; +extern int f_autodeconf, f_largemem, f_nodebsign; extern unsigned long f_debug; extern int fc_downgrade, fc_configureany, fc_hold, fc_removereinstreq, fc_overwrite; extern int fc_removeessential, fc_conflicts, fc_depends, fc_dependsversion; diff --git a/main/processarc.c b/main/processarc.c index 6153ac19..516a4c52 100644 --- a/main/processarc.c +++ b/main/processarc.c @@ -137,8 +137,7 @@ void process_archive(const char *filename) { } /* Verify the package. */ - - if (stat(DEBSIGVERIFY, &stab) == 0) { /* We have verifier */ + if (!f_nodebsig && (stat(DEBSIGVERIFY, &stab)==0)) { printf(_("Authenticating %s ...\n"), filename); fflush(stdout); c1 = m_fork(); diff --git a/po/fr.po b/po/fr.po index b4bef234..438a0809 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2441,7 +2441,6 @@ msgstr "" "récente que celle installée\n" " -B|--auto-deconfigure Installe même si cela entraîne la rupture " "d'autres paquets\n" -" --largemem | --smallmem Optimise pour l'utilisation avec une RAM " "conséquente (>4Mb) ou réduite (<4Mb)\n" " --no-act Seulement exprimer ce que l'on voudrait faire " "sans rien faire\n" @@ -2992,8 +2991,7 @@ msgstr "" #, c-format msgid "" "dpkg - warning: ignoring request to remove %.250s which isn't installed.\n" -msgstr "" -"dpkg - avertissement: requête pour supprimer %.250s qui n'a pas été installé " +msgstr "dpkg - Requête ignoreé : suppression de %.250s, qui n'est pas installé.\n" "ignorée.\n" #: main/remove.c:86