Commit a050f9cf authored by Giorgos Korfiatis's avatar Giorgos Korfiatis

Collect duplicity patches in one file

parent a685bfa6
This diff is collapsed.
This diff is collapsed.
--- dup_time.py.orig 2015-10-26 16:27:59.153178600 +0200
+++ dup_time.py 2015-10-26 16:25:45.625178600 +0200
@@ -28,6 +28,7 @@
import re
import calendar
from duplicity import globals
+from datetime import datetime
class TimeException(Exception):
@@ -155,7 +156,10 @@
def timetopretty(timeinseconds):
"""Return pretty version of time"""
- return time.asctime(time.localtime(timeinseconds))
+
+ isotime = datetime.isoformat(datetime.fromtimestamp(timeinseconds), '.')
+ return isotime
+ #return time.asctime(time.localtime(timeinseconds))
def stringtopretty(timestring):
This diff is collapsed.
This diff is collapsed.
--- duplicity.orig 2015-10-26 16:28:48.053178600 +0200
+++ duplicity 2015-10-26 16:25:34.705178600 +0200
@@ -693,8 +693,9 @@
=== modified file 'bin/duplicity'
--- bin/duplicity 2015-10-31 14:52:22 +0000
+++ bin/duplicity 2015-11-05 15:13:21 +0000
@@ -696,8 +696,9 @@
path_iter = diffdir.get_combined_path_iter(sig_chain.get_fileobjs(time))
for path in path_iter:
if path.difftype != "deleted":
......@@ -12,3 +13,28 @@
log_info = "%s %s %s" % (dup_time.timetostring(path.getmtime()),
util.escape(path.get_relative_path()),
path.type)
=== modified file 'duplicity/dup_time.py'
--- duplicity/dup_time.py 2015-02-01 17:37:37 +0000
+++ duplicity/dup_time.py 2015-11-05 15:14:06 +0000
@@ -28,6 +28,7 @@
import re
import calendar
from duplicity import globals
+from datetime import datetime
class TimeException(Exception):
@@ -155,7 +156,10 @@
def timetopretty(timeinseconds):
"""Return pretty version of time"""
- return time.asctime(time.localtime(timeinseconds))
+
+ isotime = datetime.isoformat(datetime.fromtimestamp(timeinseconds), '.')
+ return isotime
+ #return time.asctime(time.localtime(timeinseconds))
def stringtopretty(timestring):
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment