summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/apt-get.cc5
-rw-r--r--cmdline/apt-key.in2
2 files changed, 2 insertions, 5 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index b1260f06a..b6150a423 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1403,10 +1403,7 @@ static bool DoChangelog(CommandLine &CmdL)
if (printOnly == false)
{
- // Disable drop-privs if "_apt" can not write to the target dir
- CheckDropPrivsMustBeDisabled(Fetcher);
- if (_error->PendingError() == true)
- return false;
+ // Note: CheckDropPrivsMustBeDisabled isn't needed here as the download happens in a dedicated tempdir
bool Failed = false;
if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true)
diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index 881f8a990..8c47b5359 100644
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -240,7 +240,7 @@ import_keyring_into_keyring() {
shift 2
rm -f "${GPGHOMEDIR}/gpgoutput.log"
# the idea is simple: We take keys from one keyring and copy it to another
- # we do this with so many checks inbetween to ensure that WE control the
+ # we do this with so many checks in between to ensure that WE control the
# creation, so we know that the (potentially) created $TO keyring is a
# simple keyring rather than a keybox as gpg2 would create it which in turn
# can't be read by gpgv.