From 885d204bd354739187413005874797504f3b95f3 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 16 Dec 2007 18:22:24 -0200 Subject: * Applied patch from Amos Waterland to allow apt to work properly in initramfs, closes: #448316. --- cmdline/apt-get.cc | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index efb618cb0..3bcacb293 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -63,6 +64,8 @@ #include /*}}}*/ +#define RAMFS_MAGIC 0x858458f6 + using namespace std; ostream c0out(0); @@ -861,8 +864,13 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, return _error->Errno("statvfs",_("Couldn't determine free space in %s"), OutputDir.c_str()); if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) - return _error->Error(_("You don't have enough free space in %s."), - OutputDir.c_str()); + { + struct statfs Stat; + if (statfs(OutputDir.c_str(),&Stat) != 0 || + unsigned(Stat.f_type) != RAMFS_MAGIC) + return _error->Error(_("You don't have enough free space in %s."), + OutputDir.c_str()); + } } // Fail safe check @@ -2188,8 +2196,13 @@ bool DoSource(CommandLine &CmdL) return _error->Errno("statvfs",_("Couldn't determine free space in %s"), OutputDir.c_str()); if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) - return _error->Error(_("You don't have enough free space in %s"), - OutputDir.c_str()); + { + struct statfs Stat; + if (statfs(OutputDir.c_str(),&Stat) != 0 || + unsigned(Stat.f_type) != RAMFS_MAGIC) + return _error->Error(_("You don't have enough free space in %s"), + OutputDir.c_str()); + } // Number of bytes if (DebBytes != FetchBytes) -- cgit v1.2.3-70-g09d2 From 9129f2af997bf10530432c6d7cd9711cd3dbbba1 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 16 Dec 2007 18:25:29 -0200 Subject: * Applied patch from Robert Millan to make apt-key and apt-get to ignore time conflicts, closes: #451328. --- cmdline/apt-key | 4 ++-- debian/changelog | 4 +++- methods/gpgv.cc | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-key b/cmdline/apt-key index 3bd1a92d9..c7db9a25a 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -5,7 +5,7 @@ set -e # We don't use a secret keyring, of course, but gpg panics and # implodes if there isn't one available -GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg" +GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg" GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" @@ -21,7 +21,7 @@ update() { fi # add new keys - $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --ignore-time-conflict --import + $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import # remove no-longer used keys keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5` diff --git a/debian/changelog b/debian/changelog index aa324144e..8e3f9ab38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ apt (0.7.10) UNRELEASED; urgency=low to use 'min' as symbol for minute, closes: #219034. * Applied patch from Amos Waterland to allow apt to work properly in initramfs, closes: #448316. + * Applied patch from Robert Millan to make apt-key and + apt-get to ignore time conflicts, closes: #451328. [ Program translations ] - Basque updated. Closes: #453088 @@ -41,7 +43,7 @@ apt (0.7.10) UNRELEASED; urgency=low * ftparchive/multicompress.cc: - support lzma output - -- Otavio Salvador Sun, 16 Dec 2007 18:21:14 -0200 + -- Otavio Salvador Sun, 16 Dec 2007 18:23:52 -0200 apt (0.7.9) unstable; urgency=low diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 01b240856..1ed26a30a 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -83,6 +83,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, Args[i++] = gpgvpath.c_str(); Args[i++] = "--status-fd"; Args[i++] = "3"; + Args[i++] = "--ignore-time-conflict"; Args[i++] = "--keyring"; Args[i++] = pubringpath.c_str(); -- cgit v1.2.3-70-g09d2 From da543ed87d3f8b8a0030a211452c9bddfc066f0b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 16 Dec 2007 18:35:58 -0200 Subject: * Applied patch from Peter Eisentraut to fix a grammatical error ("manual installed" -> "manually installed"), closes: #438136. * --- apt-pkg/algorithms.cc | 4 ++-- cmdline/apt-get.cc | 2 +- debian/changelog | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) (limited to 'cmdline') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 62727a852..158f9c258 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1261,8 +1261,8 @@ void pkgProblemResolver::InstallProtect() Cache.MarkDelete(I); else { - // preserver the information if the package was auto - // or manual installed + // preserve the information whether the package was auto + // or manually installed bool autoInst = (Cache[I].Flags & pkgCache::Flag::Auto); Cache.MarkInstall(I, false, 0, !autoInst); } diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 3bcacb293..486e995cc 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1719,7 +1719,7 @@ bool DoInstall(CommandLine &CmdL) (Cache[Pkg].Flags & pkgCache::Flag::Auto) && _config->FindB("APT::Get::ReInstall",false) == false) { - ioprintf(c1out,_("%s set to manual installed.\n"), + ioprintf(c1out,_("%s set to manually installed.\n"), Pkg.Name()); Cache->MarkAuto(Pkg,false); AutoMarkChanged++; diff --git a/debian/changelog b/debian/changelog index 8e3f9ab38..4c56aa901 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,9 @@ apt (0.7.10) UNRELEASED; urgency=low work properly in initramfs, closes: #448316. * Applied patch from Robert Millan to make apt-key and apt-get to ignore time conflicts, closes: #451328. + * Applied patch from Peter Eisentraut to fix a + grammatical error ("manual installed" -> "manually installed"), + closes: #438136. [ Program translations ] - Basque updated. Closes: #453088 @@ -43,7 +46,10 @@ apt (0.7.10) UNRELEASED; urgency=low * ftparchive/multicompress.cc: - support lzma output - -- Otavio Salvador Sun, 16 Dec 2007 18:23:52 -0200 + [ Otavio Salvador ] + * + + -- Otavio Salvador Sun, 16 Dec 2007 18:34:40 -0200 apt (0.7.9) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 813603a05f071c07ca34921823b246e0aaaec650 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Mon, 17 Dec 2007 10:16:21 +0530 Subject: Fix wording of 'after unpacking' --- cmdline/apt-get.cc | 6 +++--- debian/changelog | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 486e995cc..53c657e8a 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -838,16 +838,16 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, if (DebBytes != FetchBytes) ioprintf(c1out,_("Need to get %sB/%sB of archives.\n"), SizeToStr(FetchBytes).c_str(),SizeToStr(DebBytes).c_str()); - else + else if (DebBytes != 0) ioprintf(c1out,_("Need to get %sB of archives.\n"), SizeToStr(DebBytes).c_str()); // Size delta if (Cache->UsrSize() >= 0) - ioprintf(c1out,_("After unpacking %sB of additional disk space will be used.\n"), + ioprintf(c1out,_("After this operation, %sB of additional disk space will be used.\n"), SizeToStr(Cache->UsrSize()).c_str()); else - ioprintf(c1out,_("After unpacking %sB disk space will be freed.\n"), + ioprintf(c1out,_("After this operation, %sB disk space will be freed.\n"), SizeToStr(-1*Cache->UsrSize()).c_str()); if (_error->PendingError() == true) diff --git a/debian/changelog b/debian/changelog index d8ce744d6..9e74d5a0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,7 +53,11 @@ apt (0.7.10) UNRELEASED; urgency=low - if RootDir is set, then FindFile and FindDir will return paths relative to the directory stored in RootDir, closes: #456457. - -- Otavio Salvador Sun, 16 Dec 2007 18:46:29 -0200 + [ Christian Perrier ] + * Fix wording for "After unpacking...". Thans to Michael Gilbert + for the patch. Closes: #260825 + + -- Christian Perrier Mon, 17 Dec 2007 10:10:17 +0530 apt (0.7.9) unstable; urgency=low -- cgit v1.2.3-70-g09d2