From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 15 Mar 2005 11:46:14 +0000 (+0000)
Subject: * ignore time conflicts on apt-key update (this is used at install time when the... 
X-Git-Tag: 0.7.24ubuntu1~341^2~3
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/1d85c6f4bfed97c9caf46aad443790a9b434fd20

* ignore time conflicts on apt-key update (this is used at install time when the clock may be totally broken)
---

diff --git a/cmdline/apt-key b/cmdline/apt-key
index a96afe944..be2b19a1a 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -21,7 +21,7 @@ update() {
     fi
 
     # add new keys
-    $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import
+    $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --ignore-time-conflict --import
 
     # remove no-longer used keys
     keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys|awk '/^pub/{FS=":";print $5}'`
diff --git a/configure.in b/configure.in
index 8c2fcbae6..3c5d6d69d 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.32")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.35")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)