patchupdate.py: Ignore 'git show' errors when tag not present yet (normal when doing a new release).

README.md

@@ -13,7 +13,7 @@ which are not present in regular wine, and always report such issues to us
 Included bugfixes and improvements
 ----------------------------------
 
-**Bugs and features included in the next upcoming release [5]:**
+**Bugfixes and features included in the next upcoming release [5]:**
 
 * Other Pipelight-specific enhancements
 * Support for DwmInvalidateIconicBitmaps ([Wine Bug #32977](http://bugs.winehq.org/show_bug.cgi?id=32977 "Solidworks 2012 needs unimplemented function dwmapi.dll.DwmInvalidateIconicBitmaps (Win7 mode)"))

debian/changelog

@@ -1,4 +1,5 @@
 wine-compholio (1.7.25) UNRELEASED; urgency=low
+  * Improve generation of README.md on patch update.
   * Added patch with stub for DwmInvalidateIconicBitmaps.
   * Added Courier Prime (OFLv1.1) as a Courier New replacement.
   * Added patch to better detect broken nVidia RandR 1.2 support.

debian/tools/patchupdate.py

@@ -157,8 +157,12 @@ def enum_directories(revision, path):
             dirs.append((name, subdirectory))
     else:
         filename = "%s:%s" % (revision, path)
-        with open(os.devnull, 'w') as devnull:
-            content = subprocess.check_output(["git", "show", filename], stderr=devnull)
+        try:
+            with open(os.devnull, 'w') as devnull:
+                content = subprocess.check_output(["git", "show", filename], stderr=devnull)
+        except subprocess.CalledProcessError as e:
+            if e.returncode != 128: raise
+            return [] # ignore error
         lines = content.split("\n")
         if not lines[0].startswith("tree ") or lines[1] != "":
             raise RuntimeError("Unexpected output from 'git show %s'" % filename)
@@ -336,7 +340,7 @@ def get_wine_file(filename, force=False):
         with open(os.devnull, 'w') as devnull:
             content = subprocess.check_output(["git", "show", entry], cwd=config.path_wine, stderr=devnull)
     except subprocess.CalledProcessError as e:
-        if e.returncode != 128: raise # not found
+        if e.returncode != 128: raise
         content = ""
 
     content_hash = hashlib.sha256(content).digest()
@@ -562,13 +566,18 @@ def generate_markdown(all_patches, stable_patches, stable_compholio_version):
     old_fixes = [(mode, bugid, bugname) for dummy, (mode, bugid, bugname) in
                                             all_fixes.iteritems() if mode <= 0]
 
+    # List of old fixes is not available when releasing a new version
+    if len(old_fixes) == 0:
+        old_fixes = new_fixes
+        new_fixes = []
+
     # Query information from bugzilla
     bug_short_desc = _winebugs_query_short_desc(all_bugids)
 
     # Generate information for current version
     lines = []
     if len(new_fixes):
-        lines.append("**Bugs and features included in the next upcoming release [%d]:**" % len(new_fixes))
+        lines.append("**Bugfixes and features included in the next upcoming release [%d]:**" % len(new_fixes))
         lines.append("")
         for mode, bugid, bugname in sorted(new_fixes, key=lambda x: x[2]):
             lines.append(_format_bug(mode, bugid, bugname))