[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20160705-72-g98b94fe

jturney@sourceware.org jturney@sourceware.org
Sat Apr 22 15:35:00 GMT 2017




https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=98b94fe796569f6b97da36d8e37d634e33c2f21e

commit 98b94fe796569f6b97da36d8e37d634e33c2f21e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sat Apr 22 13:23:56 2017 +0100

    Honour attempts to delete hint files from packages
    
    So .hint files removed by request are properly noted as deleted and we don't
    bogusly try to remove them again if stale.


Diff:
---
 calm/package.py |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/calm/package.py b/calm/package.py
index 81069f2..51decbf 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -49,6 +49,7 @@ class Package(object):
     def __init__(self):
         self.path = ''  # path to package, relative to release area
         self.tars = {}
+        self.hint_files = {}
         self.is_used_by = set()
         self.version_hints = {}
         self.override_hints = {}
@@ -887,6 +888,11 @@ def delete(packages, path, fn):
                     del packages[p].tars[t]
                     break
 
+            for h in packages[p].hint_files:
+                if packages[p].hint_files[h] == fn:
+                    del packages[p].hint_files[h]
+                    break
+
 
 #
 # verify that the package ppath is in the list of packages plist



More information about the Cygwin-apps-cvs mailing list