diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-22 16:01:00 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-22 16:01:00 +0200 |
| commit | 555a487afb510c561d094f27bb08119694e7388f (patch) | |
| tree | 8b911f2ece6122e70b812628e598c9cccbf0e989 /cmdline | |
| parent | ce2de59157d5ac584005c76f58b277adcaf8e1ab (diff) | |
| parent | a3bbbab7ca5f94391b2158cfe9deb85eb335e29a (diff) | |
merged from donkult
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-get.cc | 3 | ||||
| -rwxr-xr-x | cmdline/apt-key | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 99ee4f228..1e7fee96b 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2366,8 +2366,7 @@ bool DoSource(CommandLine &CmdL) // Create the download object AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); pkgAcquire Fetcher; - if (Fetcher.Setup(&Stat) == false) - return false; + Fetcher.SetLog(&Stat); DscFile *Dsc = new DscFile[CmdL.FileSize()]; diff --git a/cmdline/apt-key b/cmdline/apt-key index 843163f82..8a995dadd 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -5,9 +5,12 @@ unset GREP_OPTIONS # We don't use a secret keyring, of course, but gpg panics and # implodes if there isn't one available -GPG_CMD='gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg' +SECRETKEYRING="$(mktemp)" +trap "rm -f '${SECRETKEYRING}'" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM +GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring '${SECRETKEYRING}'" if [ "$(id -u)" -eq 0 ]; then + # we could use a tmpfile here too, but creation of this tends to be time-consuming GPG_CMD="$GPG_CMD --trustdb-name /etc/apt/trustdb.gpg" fi |