aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--handlers/dup.in4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b8d383..f944201 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@ version 0.9.8 -- UNRELEASED
. Use duplicity's --extra-clean option to get rid of unnecessary old
cache files when cleaning up. This is enabled when using duplicity
0.6.01 or newer, that depends on local caching (Closes: #572721)
+ . dup: ignore anything but digits and "." when comparing versions
+ (Closes: #578987)
version 0.9.7 -- January 27, 2010
backupninja changes
diff --git a/handlers/dup.in b/handlers/dup.in
index c8dfcba..c893017 100644
--- a/handlers/dup.in
+++ b/handlers/dup.in
@@ -95,8 +95,8 @@ else
execstr_serverpart="scp://$destuser@$desthost/$destdir"
fi
-### duplicity version
-duplicity_version="`duplicity --version | @AWK@ '{print $2}'`"
+### duplicity version (ignore anything else than 0-9 and ".")
+duplicity_version="`duplicity --version | @AWK@ '{print $2}' | @SED@ 's/[^.[:digit:]]//g'`"
duplicity_major="`echo $duplicity_version | @AWK@ -F '.' '{print $1}'`"
duplicity_minor="`echo $duplicity_version | @AWK@ -F '.' '{print $2}'`"
duplicity_sub="`echo $duplicity_version | @AWK@ -F '.' '{print $3}'`"