1.1 --- a/patches/patch-moin-1.9-MoinMoin-packages.diff Fri Nov 01 19:30:41 2013 +0100
1.2 +++ b/patches/patch-moin-1.9-MoinMoin-packages.diff Fri Nov 01 19:44:37 2013 +0100
1.3 @@ -1,6 +1,6 @@
1.4 diff -r 77533e162654 MoinMoin/packages.py
1.5 --- a/MoinMoin/packages.py Tue Aug 13 12:17:47 2013 +0200
1.6 -+++ b/MoinMoin/packages.py Fri Nov 01 19:28:42 2013 +0100
1.7 ++++ b/MoinMoin/packages.py Fri Nov 01 19:43:59 2013 +0100
1.8 @@ -96,6 +96,10 @@
1.9 """
1.10 return (string.lower() in ('yes', 'true', '1'))
1.11 @@ -12,6 +12,24 @@
1.12 class ScriptEngine:
1.13 """
1.14 The script engine supplies the needed commands to execute the installation
1.15 +@@ -118,7 +122,7 @@
1.16 + self.msg = getattr(self, "msg", "")
1.17 + self.request = getattr(self, "request", None)
1.18 +
1.19 +- def do_addattachment(self, zipname, filename, pagename, author=u"Scripting Subsystem", comment=u""):
1.20 ++ def do_addattachment(self, zipname, filename, pagename, author=u"Scripting Subsystem", comment=u"", mtime=None):
1.21 + """
1.22 + Installs an attachment
1.23 +
1.24 +@@ -133,7 +137,7 @@
1.25 + filename = wikiutil.taintfilename(filename)
1.26 + zipname = wikiutil.taintfilename(zipname)
1.27 + target = os.path.join(attachments, filename)
1.28 +- page = PageEditor(self.request, pagename, do_editor_backup=0, uid_override=author)
1.29 ++ page = PageEditor(self.request, pagename, do_editor_backup=0, uid_override=author, mtime=mtime)
1.30 + rev = page.current_rev()
1.31 + path = page.getPagePath(check_create=0)
1.32 + if not os.path.exists(target):
1.33 @@ -286,7 +290,7 @@
1.34
1.35 self.msg += package.msg
1.36 @@ -21,15 +39,18 @@
1.37 """ Adds a revision to a page.
1.38
1.39 @param filename: name of the file in this package
1.40 -@@ -298,7 +302,7 @@
1.41 +@@ -298,9 +302,9 @@
1.42 _ = self.request.getText
1.43 trivial = str2boolean(trivial)
1.44 if self.request.user.may.write(pagename):
1.45 - page = PageEditor(self.request, pagename, do_editor_backup=0)
1.46 + page = PageEditor(self.request, pagename, do_editor_backup=0, uid_override=author)
1.47 try:
1.48 - page.saveText(self.extract_file(filename).decode("utf-8"), 0, trivial=trivial, comment=comment)
1.49 +- page.saveText(self.extract_file(filename).decode("utf-8"), 0, trivial=trivial, comment=comment)
1.50 ++ page.saveText(self.extract_file(filename).decode("utf-8"), 0, trivial=trivial, comment=comment, mtime=mtime)
1.51 except PageEditor.Unchanged:
1.52 + pass
1.53 + else:
1.54 @@ -555,6 +559,7 @@
1.55 # Setup MoinMoin environment
1.56 from MoinMoin.web.contexts import ScriptContext