summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-04-01 22:59:56 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-04-01 22:59:56 +0000
commit284c8bbc764fed53bd0f9bc6a42a7521a0c617ce (patch)
treeb11645dc0885214eb9bbf257b6fe1fc5a9f43be0
parent06f02b954f5c4ca7cb9cc288ea5a8fcb6a1052d4 (diff)
* changelog updated
-rw-r--r--apt-pkg/acquire-item.cc6
-rw-r--r--configure.in2
-rw-r--r--debian/changelog10
3 files changed, 17 insertions, 1 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 714edd8d8..b2f896627 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -340,6 +340,12 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
// File was already in place. It needs to be re-verified
// because Release might have changed, so Move it into partial
Rename(Final,DestFile);
+ // unlink the file and do not try to use I-M-S and Last-Modified
+ // if the users proxy is broken
+ if(_config->FindB("Acquire::BrokenProxy", false) == true) {
+ std::cerr << "forcing re-get of the signature file as requested" << std::endl;
+ unlink(DestFile.c_str());
+ }
}
QueueURI(Desc);
diff --git a/configure.in b/configure.in
index 3c5d6d69d..e17a126ba 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.35")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.35ubuntu1")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index 1820b2cbf..9f8ea192b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apt (0.6.35ubuntu1) hoary; urgency=low
+
+ * apt-pkg/acquire-item.cc:
+ added "Acquire::BrokenProxy" that will force apt to always
+ re-get the Release.gpg file (for broken proxies)
+ * debian/apt.cron.daily:
+ MinAge is defaulting to 2 days now to prevent over-aggresive removal
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 31 Mar 2005 20:37:11 +0200
+
apt (0.6.35) hoary; urgency=low
* Merge apt--mvo--0 (incorporates 0.6.34ubuntu1):