diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-03-15 11:46:14 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-03-15 11:46:14 +0000 |
| commit | 1d85c6f4bfed97c9caf46aad443790a9b434fd20 (patch) | |
| tree | eab8e9e493b6b591950739393c97f94a245cc944 | |
| parent | 01717245170c1fbb8080a9737f1da70877e302e8 (diff) | |
* ignore time conflicts on apt-key update (this is used at install time when the clock may be totally broken)
| -rwxr-xr-x | cmdline/apt-key | 2 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 2 insertions, 2 deletions
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) |