X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=module-tools.py;h=db72e18ec65e7475e96af9e307bb9282751844c5;hb=ea59599964f3eab6a2e3ebf436a45654b0b8626c;hp=594f81cad6671efca3bcd956c4ab7c6c3a234de5;hpb=019de7833a6d83c2e5cf60fda92e948388a2fe7b;p=build.git

diff --git a/module-tools.py b/module-tools.py
index 594f81ca..db72e18e 100755
--- a/module-tools.py
+++ b/module-tools.py
@@ -380,11 +380,16 @@ that for other purposes than tagging"""%topdir
     def unignored_lines (self, logfile):
         result=[]
         exclude="Tagging module %s"%self.name
+        white_line_matcher = re.compile("\A\s*\Z")
         for logline in file(logfile).readlines():
             if logline.strip() == Module.svn_magic_line:
                 break
-            if logline.find(exclude) < 0:
-                result += [ logline ]
+            if logline.find(exclude) >= 0:
+                continue
+            elif white_line_matcher.match(logline):
+                continue
+            else:
+                result.append(logline.strip()+'\n')
         return result
 
     def insert_changelog (self, logfile, oldtag, newtag):
@@ -527,7 +532,7 @@ that for other purposes than tagging"""%topdir
 
 ##############################
     sync_warning="""*** WARNING
-The module-init function has the following limitations
+The module-sync function has the following limitations
 * it does not handle changelogs
 * it does not scan the -tags*.mk files to adopt the new tags"""
 
@@ -824,7 +829,7 @@ will be based on latest tag %s and *not* on the current trunk"""%(self.name,bran
         # create commit log file
         tmp="/tmp/branching-%d"%os.getpid()
         f=open(tmp,"w")
-        f.write("Branch %s for module %s created from tag %s\n"%(new_trunk_name,self.name,latest_tag_name))
+        f.write("Branch %s for module %s created (as new trunk) from tag %s\n"%(new_trunk_name,self.name,latest_tag_name))
         f.close()
 
         # we're done, let's commit the stuff