Merge lp:~mterry/duplicity/fix-gpg-options-crash-0.6 into lp:duplicity/0.6

[Michael Terry]

[Michael Terry (mterry)]

This fixes the recently reported bug on the mailing list where duplicity crashes when given an empty argument to --gpg-options. My bad.

[lp:~mterry/duplicity/fix-gpg-options-crash-0.6]

644. By Michael Terry on 2010-03-01

and handle initial, empty value for extend commandline actions

645. By Michael Terry on 2010-03-02

fix time command line handling

=== modified file 'duplicity-bin'
--- duplicity-bin	2010-02-17 18:00:45 +0000
+++ duplicity-bin	2010-03-02 01:43:12 +0000
@@ -1111,10 +1111,13 @@
         os.setuid(os.geteuid())
         os.setgid(os.getegid())
 
+    # set the current time strings (make it available for command line processing)
+    dup_time.setcurtime()
+
     # determine what action we're performing and process command line
     action = commandline.ProcessCommandLine(sys.argv[1:])
 
-    # set the current time strings
+    # set the current time strings again now that we have time separator
     dup_time.setcurtime()
 
     # get the passphrase if we need to based on action/options

=== modified file 'duplicity/commandline.py'
--- duplicity/commandline.py	2009-12-28 16:03:09 +0000
+++ duplicity/commandline.py	2010-03-02 01:43:12 +0000
@@ -158,7 +158,9 @@
 
     def take_action(self, action, dest, opt, value, values, parser):
         if action == "extend":
-            if hasattr(values, dest):
+            if not value:
+                return
+            if hasattr(values, dest) and getattr(values, dest):
                 setattr(values, dest, getattr(values, dest) + ' ' + value)
             else:
                 setattr(values, dest, value)

=== modified file 'duplicity/dup_time.py'
--- duplicity/dup_time.py	2009-04-02 14:47:12 +0000
+++ duplicity/dup_time.py	2010-03-02 01:43:12 +0000
@@ -63,7 +63,7 @@
 def setcurtime(time_in_secs = None):
     """Sets the current time in curtime and curtimestr"""
     global curtime, curtimestr
-    t = time_in_secs or long(time.time())
+    t = time_in_secs or curtime or long(time.time()) # only set from NOW once
     assert type(t) in (types.LongType, types.IntType)
     curtime, curtimestr = t, timetostring(t)