1.1 --- a/patches/patch-moin-1.9-MoinMoin-packages.diff Fri Nov 01 21:09:50 2013 +0100
1.2 +++ b/patches/patch-moin-1.9-MoinMoin-packages.diff Fri Nov 01 22:48:35 2013 +0100
1.3 @@ -1,6 +1,6 @@
1.4 -diff -r d0f5d4b70647 MoinMoin/packages.py
1.5 ---- a/MoinMoin/packages.py Sat Jul 20 00:03:25 2013 +0200
1.6 -+++ b/MoinMoin/packages.py Fri Nov 01 21:04:48 2013 +0100
1.7 +diff -r 3131859d555c MoinMoin/packages.py
1.8 +--- a/MoinMoin/packages.py Tue Jul 30 17:58:46 2013 +0200
1.9 ++++ b/MoinMoin/packages.py Fri Nov 01 22:46:55 2013 +0100
1.10 @@ -96,6 +96,10 @@
1.11 """
1.12 return (string.lower() in ('yes', 'true', '1'))
1.13 @@ -26,7 +26,7 @@
1.14 zipname = wikiutil.taintfilename(zipname)
1.15 target = os.path.join(attachments, filename)
1.16 - page = PageEditor(self.request, pagename, do_editor_backup=0, uid_override=author)
1.17 -+ page = PageEditor(self.request, pagename, do_editor_backup=0, uid_override=author, mtime=mtime)
1.18 ++ page = PageEditor(self.request, pagename, do_editor_backup=0, uid_override=author, mtime=mtime and int(mtime))
1.19 rev = page.current_rev()
1.20 path = page.getPagePath(check_create=0)
1.21 if not os.path.exists(target):
1.22 @@ -35,7 +35,7 @@
1.23 self.msg += package.msg
1.24
1.25 - def do_addrevision(self, filename, pagename, author=u"Scripting Subsystem", comment=u"", trivial=u"No"):
1.26 -+ def do_addrevision(self, filename, pagename, author=u"Scripting Subsystem", comment=u"", trivial=u"No", mtime=None):
1.27 ++ def do_addrevision(self, filename, pagename, author=u"Scripting Subsystem", comment=u"", mtime=None, trivial=u"No"):
1.28 """ Adds a revision to a page.
1.29
1.30 @param filename: name of the file in this package
1.31 @@ -44,7 +44,7 @@
1.32 trivial = str2boolean(trivial)
1.33 if self.request.user.may.write(pagename):
1.34 - page = PageEditor(self.request, pagename, do_editor_backup=0)
1.35 -+ page = PageEditor(self.request, pagename, do_editor_backup=0, uid_override=author, mtime=mtime)
1.36 ++ page = PageEditor(self.request, pagename, do_editor_backup=0, uid_override=author, mtime=mtime and int(mtime))
1.37 try:
1.38 page.saveText(self.extract_file(filename).decode("utf-8"), 0, trivial=trivial, comment=comment)
1.39 except PageEditor.Unchanged: