From 83e6798e72fabee7ec333a7e897b095cda688c45 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 24 Mar 2011 17:37:18 +0100 Subject: merge fix from Matt Zimmerman, many thanks (LP: #741098) --- debian/changelog | 1 + methods/mirror.cc | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d9a20765f..6ccb3dede 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ apt (0.8.13) unstable; urgency=low * mirror method: - when downloading data, show the mirror being used - randomize mirror list to ensure more even load + - merge fix from Matt Zimmerman, many thanks (LP: #741098) -- Michael Vogt Thu, 10 Mar 2011 15:56:54 +0100 diff --git a/methods/mirror.cc b/methods/mirror.cc index e499b054b..9d8202dad 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -141,8 +141,10 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str) pkgAcquire Fetcher; new pkgAcqFile(&Fetcher, fetch, "", 0, "", "", "", MirrorFile); bool res = (Fetcher.Run() == pkgAcquire::Continue); - if(res) + if(res) { DownloadedMirrorFile = true; + chmod(MirrorFile.c_str(), 0644); + } Fetcher.Shutdown(); if(Debug) -- cgit v1.2.3 From 0004842de7eeac345b614fa0b6bd241af0c4cc34 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 24 Mar 2011 17:45:20 +0100 Subject: do not crash if the mirror file fails to download --- debian/changelog | 1 + methods/mirror.cc | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6ccb3dede..fc883dc0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ apt (0.8.13) unstable; urgency=low - when downloading data, show the mirror being used - randomize mirror list to ensure more even load - merge fix from Matt Zimmerman, many thanks (LP: #741098) + - do not crash if the mirror file fails to download -- Michael Vogt Thu, 10 Mar 2011 15:56:54 +0100 diff --git a/methods/mirror.cc b/methods/mirror.cc index 9d8202dad..00757e61f 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -160,6 +160,9 @@ bool MirrorMethod::RandomizeMirrorFile(string mirror_file) vector content; string line; + if (!FileExists(mirror_file)) + return false; + // read ifstream in(mirror_file.c_str()); while ( !in.eof() ) { @@ -356,8 +359,8 @@ bool MirrorMethod::Fetch(FetchItem *Itm) if(Itm->IndexFile && !DownloadedMirrorFile) { Clean(_config->FindDir("Dir::State::mirrors")); - DownloadMirrorFile(Itm->Uri); - RandomizeMirrorFile(MirrorFile); + if (DownloadMirrorFile(Itm->Uri)) + RandomizeMirrorFile(MirrorFile); } if(AllMirrors.empty()) { -- cgit v1.2.3 From b46fb8ff65bf345e51b11946783b450f6fa8f0a8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 24 Mar 2011 18:01:25 +0100 Subject: methods/mirror.cc: raise error if the mirror file can not be read --- methods/mirror.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/methods/mirror.cc b/methods/mirror.cc index 00757e61f..2cf5c9ce1 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -256,6 +256,13 @@ bool MirrorMethod::InitMirrors() return _error->Error(_("No mirror file '%s' found "), MirrorFile.c_str()); } + if (access(MirrorFile.c_str(), R_OK) != 0) + { + // FIXME: fallback to a default mirror here instead + // and provide a config option to define that default + return _error->Error(_("Can not read mirror file '%s'"), MirrorFile.c_str()); + } + // FIXME: make the mirror selection more clever, do not // just use the first one! // BUT: we can not make this random, the mirror has to be -- cgit v1.2.3 From bdb3d92cd2d96909eecc5d972206dc761f278381 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 5 Apr 2011 12:06:10 +0200 Subject: * apt-pkg/aptconfiguration.cc: - fix comparing for a empty string --- apt-pkg/aptconfiguration.cc | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 14ee09e0d..ca602d4bf 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -337,7 +337,7 @@ std::vector const Configuration::getArchitectures(bool const &Cache char* arch = strtok(buf, " "); while (arch != NULL) { for (; isspace(*arch) != 0; ++arch); - if (arch != '\0') { + if (arch[0] != '\0') { char const* archend = arch; for (; isspace(*archend) == 0 && *archend != '\0'; ++archend); archs.push_back(string(arch, (archend - arch))); diff --git a/debian/changelog b/debian/changelog index 46d677421..98efce3af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ apt (0.8.13.3) unstable; urgency=low [ Michael Vogt ] * mirror method: - do not crash if the mirror file fails to download + * apt-pkg/aptconfiguration.cc: + - fix comparing for a empty string -- Michael Vogt Thu, 10 Mar 2011 15:56:54 +0100 -- cgit v1.2.3 From c996a75cabffa5d3e5bc610d9f1097c2edae606f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 7 Apr 2011 11:03:40 +0200 Subject: * debian/apt.cron.daily: - run unattended-upgrades even if there was a error during the apt-get update (LP: #676295) --- debian/apt.cron.daily | 2 +- debian/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index c61bfb9bb..75986f5f5 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -466,7 +466,7 @@ fi # auto upgrade all upgradeable packages UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp -if [ $UPDATED -eq 1 ] && which unattended-upgrade >/dev/null && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then +if which unattended-upgrade >/dev/null && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then if unattended-upgrade $XUUPOPT; then update_stamp $UPGRADE_STAMP debug_echo "unattended-upgrade (success)" diff --git a/debian/changelog b/debian/changelog index 98efce3af..cbaa65748 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ apt (0.8.13.3) unstable; urgency=low - do not crash if the mirror file fails to download * apt-pkg/aptconfiguration.cc: - fix comparing for a empty string + * debian/apt.cron.daily: + - run unattended-upgrades even if there was a error during + the apt-get update (LP: #676295) -- Michael Vogt Thu, 10 Mar 2011 15:56:54 +0100 -- cgit v1.2.3