# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1383342515 -3600
# Node ID e03ec526eebcd9d837cb4d4d0ed081bdc26412b1
# Parent  47a46a1da7386166c5e5719e867c0db35ab52d21
Reordered the addrevision parameters, putting mtime before trivial.
Added conversions of mtime values.

diff -r 47a46a1da738 -r e03ec526eebc patches/patch-moin-1.9-MoinMoin-packages.diff
--- a/patches/patch-moin-1.9-MoinMoin-packages.diff	Fri Nov 01 21:09:50 2013 +0100
+++ b/patches/patch-moin-1.9-MoinMoin-packages.diff	Fri Nov 01 22:48:35 2013 +0100
@@ -1,6 +1,6 @@
-diff -r d0f5d4b70647 MoinMoin/packages.py
---- a/MoinMoin/packages.py	Sat Jul 20 00:03:25 2013 +0200
-+++ b/MoinMoin/packages.py	Fri Nov 01 21:04:48 2013 +0100
+diff -r 3131859d555c MoinMoin/packages.py
+--- a/MoinMoin/packages.py	Tue Jul 30 17:58:46 2013 +0200
++++ b/MoinMoin/packages.py	Fri Nov 01 22:46:55 2013 +0100
 @@ -96,6 +96,10 @@
      """
      return (string.lower() in ('yes', 'true', '1'))
@@ -26,7 +26,7 @@
              zipname = wikiutil.taintfilename(zipname)
              target = os.path.join(attachments, filename)
 -            page = PageEditor(self.request, pagename, do_editor_backup=0, uid_override=author)
-+            page = PageEditor(self.request, pagename, do_editor_backup=0, uid_override=author, mtime=mtime)
++            page = PageEditor(self.request, pagename, do_editor_backup=0, uid_override=author, mtime=mtime and int(mtime))
              rev = page.current_rev()
              path = page.getPagePath(check_create=0)
              if not os.path.exists(target):
@@ -35,7 +35,7 @@
          self.msg += package.msg
  
 -    def do_addrevision(self, filename, pagename, author=u"Scripting Subsystem", comment=u"", trivial=u"No"):
-+    def do_addrevision(self, filename, pagename, author=u"Scripting Subsystem", comment=u"", trivial=u"No", mtime=None):
++    def do_addrevision(self, filename, pagename, author=u"Scripting Subsystem", comment=u"", mtime=None, trivial=u"No"):
          """ Adds a revision to a page.
  
          @param filename: name of the file in this package
@@ -44,7 +44,7 @@
          trivial = str2boolean(trivial)
          if self.request.user.may.write(pagename):
 -            page = PageEditor(self.request, pagename, do_editor_backup=0)
-+            page = PageEditor(self.request, pagename, do_editor_backup=0, uid_override=author, mtime=mtime)
++            page = PageEditor(self.request, pagename, do_editor_backup=0, uid_override=author, mtime=mtime and int(mtime))
              try:
                  page.saveText(self.extract_file(filename).decode("utf-8"), 0, trivial=trivial, comment=comment)
              except PageEditor.Unchanged: