On Fri, Apr 10, 2009 at 12:45:44PM +0200, Sebastian Heinlein wrote: > Hello, > > At first I have to say that I appreciate your recent work on all the > python packages a lot. > > But it seems that you have missed the attachment. > > Cheers, > > Sebastian > > Oh, sorry. I attached the merge directive in this email.
-- Julian Andres Klode - Free Software Developer Debian Developer - Contributing Member of SPI Ubuntu Member - Fellow of FSFE Website: http://jak-linux.org/ XMPP: juli...@jabber.org Debian: http://www.debian.org/ SPI: http://www.spi-inc.org/ Ubuntu: http://www.ubuntu.com/ FSFE: http://www.fsfe.org/
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: j...@debian.org-20090409163921-4h03ob28pvyjurit # target_branch: http://bazaar.launchpad.net/%7Epython-distutils-\ # extra-hackers/python-distutils-extra/debian/ # testament_sha1: 4c5b0a19032dbc798b6ef386b1ec577b97b5b874 # timestamp: 2009-04-09 18:46:24 +0200 # base_revision_id: mp...@debian.org-20090325181502-m9b7u01evi86r6og # # Begin patch === modified file 'DistUtilsExtra/command/build_i18n.py' --- DistUtilsExtra/command/build_i18n.py 2008-03-18 20:53:56 +0000 +++ DistUtilsExtra/command/build_i18n.py 2009-04-09 16:39:21 +0000 @@ -78,7 +78,7 @@ os.chdir(self.po_dir) self.spawn(cmd) os.chdir(wd) - + max_po_mtime = 0 for po_file in glob.glob("%s/*.po" % self.po_dir): lang = os.path.basename(po_file[:-3]) mo_dir = os.path.join("build", "mo", lang, "LC_MESSAGES") @@ -86,7 +86,12 @@ if not os.path.exists(mo_dir): os.makedirs(mo_dir) cmd = ["msgfmt", po_file, "-o", mo_file] - self.spawn(cmd) + po_mtime = os.path.getmtime(po_file) + mo_mtime = os.path.exists(mo_file) and os.path.getmtime(mo_file) or 0 + if po_mtime > max_po_mtime: + max_po_mtime = po_mtime + if po_mtime > mo_mtime: + self.spawn(cmd) targetpath = os.path.join("share/locale", lang, "LC_MESSAGES") data_files.append((targetpath, (mo_file,))) @@ -115,7 +120,12 @@ file_merged = os.path.join(build_target, file_merged) cmd = ["intltool-merge", switch, self.po_dir, file, file_merged] - self.spawn(cmd) + mtime_merged = os.path.exists(file_merged) and \ + os.path.getmtime(file_merged) or 0 + mtime_file = os.path.getmtime(file) + if mtime_merged < max_po_mtime or mtime_merged < mtime_file: + # Only build if output is older than input (.po,.in) + self.spawn(cmd) files_merged.append(file_merged) data_files.append((target, files_merged)) === modified file 'debian/changelog' --- debian/changelog 2009-03-25 18:15:02 +0000 +++ debian/changelog 2009-04-09 16:34:57 +0000 @@ -1,3 +1,10 @@ +python-distutils-extra (1.92.1) unstable; urgency=low + + * DistUtilsExtra/command/build_i18n.py: Only rebuild files if the input + has been modified after the output has been produced. + + -- Julian Andres Klode <j...@debian.org> Thu, 09 Apr 2009 18:21:22 +0200 + python-distutils-extra (1.92) unstable; urgency=low * Add DistUtilsExtra/command/check.py: New "check" command, running pylint # Begin bundle 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
signature.asc
Description: Digital signature
