[Python-apps-commits] r12741 - in packages/rubber/trunk/debian/patches (3 files)

[hilmar-guest at users.alioth.debian.org]

    Date: Thursday, January 21, 2016 @ 20:02:51
  Author: hilmar-guest
Revision: 12741

Two patch: better logging + bibtext crash.

Added:
  packages/rubber/trunk/debian/patches/01_accurate_log.diff
  packages/rubber/trunk/debian/patches/02_bibtex_stacktrace.diff
  packages/rubber/trunk/debian/patches/series

Added: packages/rubber/trunk/debian/patches/01_accurate_log.diff
===================================================================
--- packages/rubber/trunk/debian/patches/01_accurate_log.diff	                        (rev 0)
+++ packages/rubber/trunk/debian/patches/01_accurate_log.diff	2016-01-21 20:02:51 UTC (rev 12741)
@@ -0,0 +1,52 @@
+From 8871e6d40213b63668f34bcd148c30a36a79933a Mon Sep 17 00:00:00 2001
+From: Nicolas Boulenguez <nicolas.boulenguez at free.fr>
+Date: Sun, 11 Oct 2015 15:04:34 +0100
+Subject: more accurate log messages when deciding whether to rebuild some file
+
+
+diff --git a/src/depend.py b/src/depend.py
+index 7fa3095..9b0395d 100644
+--- a/src/depend.py
++++ b/src/depend.py
+@@ -56,7 +56,7 @@ class Node (object):
+ 			# only for the second build during this rubber run, we want to skip
+ 			# recompiling based on MD5 hashes.  for the first build, only the
+ 			# date counts.
+-			self.md5_for_source[name] = "UNKNOWN"
++			self.md5_for_source[name] = None
+ 
+ 	def remove_source (self, name):
+ 		"""
+@@ -104,15 +104,21 @@ class Node (object):
+ 			# FIXME complain if source has been modified in an unplanned way
+ 			# NB: we ignore the case source.date == None (missing dependency) here.
+ 			# NB2: to be extra correct, equal (disk-precision) timestamps trigger a recompile.
+-			if source.date is not None and source.date >= self.date:
+-				if self.md5_for_source.has_key (source_name):
+-					if self.md5_for_source[source_name] == rubber.util.md5_file (source_name):
+-						msg.debug(_("while making %s: contents of %s unchanged, ignoring mtime") % (self.products[0], source_name), pkg="depend")
+-						continue
+-					msg.debug(_("while making %s: contents of dependency %s changed, rebuilding") % (self.products[0], source_name), pkg="depend")
+-					return True
+-				msg.debug(_("while making %s: timestamp of dependency %s changed, rebuilding") % (self.products[0], source_name), pkg="depend")
++			if source.date == None:
++				msg.debug(_("Not rebuilding %s from %s: unknown source timestamp") % (self.products[0], source_name), pkg="depend")
++			elif source.date < self.date:
++				msg.debug(_("Not rebuilding %s from %s: up to date") % (self.products[0], source_name), pkg="depend")
++			elif not self.md5_for_source.has_key (source_name):
++				msg.debug(_("Rebuilding %s from %s: outdated, source not tracked") % (self.products[0], source_name), pkg="depend")
+ 				return True
++			elif self.md5_for_source [source_name] == None:
++				msg.debug(_("Rebuilding %s from %s: outdated, previous source unknown") % (self.products[0], source_name), pkg="depend")
++				return True
++			elif self.md5_for_source [source_name] != rubber.util.md5_file (source_name):
++				msg.debug(_("Rebuilding %s from %s: outdated, source really modified") % (self.products[0], source_name), pkg="depend")
++				return True
++			else:
++				msg.debug(_("Not rebuilding %s from %s: outdated, but source unmodified") % (self.products[0], source_name), pkg="depend")
+ 		return False
+ 
+ 	def make (self, force=False):
+-- 
+cgit v0.10.2
+

Added: packages/rubber/trunk/debian/patches/02_bibtex_stacktrace.diff
===================================================================
--- packages/rubber/trunk/debian/patches/02_bibtex_stacktrace.diff	                        (rev 0)
+++ packages/rubber/trunk/debian/patches/02_bibtex_stacktrace.diff	2016-01-21 20:02:51 UTC (rev 12741)
@@ -0,0 +1,34 @@
+From 78e6130ccedde9ec833ed5b2d6f415bbde38f144 Mon Sep 17 00:00:00 2001
+From: Sebastian Kapfer <sebastian.kapfer at fau.de>
+Date: Thu, 14 Jan 2016 11:01:08 +0100
+Subject: fix stacktrace when parsing a BibTeX error lacking a line number
+ (modified from Emmanuel)
+
+
+diff --git a/src/biblio.py b/src/biblio.py
+index 6843e80..0c67582 100644
+--- a/src/biblio.py
++++ b/src/biblio.py
+@@ -81,16 +81,17 @@ class BibToolDep (rubber.depend.Node):
+ 						filename = filename[:-4]
+ 
+ 					filename = self.find_bib (filename) or filename
+-					line = int (m.group ("line"))
+ 
+ 					d =	{
+ 						"pkg": "bibtex",
+ 						"kind": "error",
+ 						"file": filename,
+-						"line": line,
+ 						"text": text
+ 					}
+ 
++					if m.group ("line"):
++						d["line"] = int (m.group ("line"))
++
+ 					yield d
+ 
+ 				last_line = line
+-- 
+cgit v0.10.2
+

Added: packages/rubber/trunk/debian/patches/series
===================================================================
--- packages/rubber/trunk/debian/patches/series	                        (rev 0)
+++ packages/rubber/trunk/debian/patches/series	2016-01-21 20:02:51 UTC (rev 12741)
@@ -0,0 +1,2 @@
+01_accurate_log.diff
+02_bibtex_stacktrace.diff