[calm - Cygwin server-side packaging maintenance script] branch master, updated. 60c749590746bf7ffc6222bf17e0191f025ca017

[jturney@sourceware.org]

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

commit 60c749590746bf7ffc6222bf17e0191f025ca017
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Thu May 19 12:15:51 2016 +0000

    Removing setup.hint files isn't allowed
    
    Removing a package doesn't make much sense currently, all we can do is
    replace it with an empty, obsolete one, so existing installs are updated to
    that.


Diff:
---
 calm/calm.py    |    3 ---
 calm/uploads.py |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/calm/calm.py b/calm/calm.py
index 9fc350e..97746fb 100755
--- a/calm/calm.py
+++ b/calm/calm.py
@@ -149,9 +149,6 @@ def process(args):
                         break
 
                     # remove files which are to be removed
-                    #
-                    # XXX: this doesn't properly account for removing setup.hint
-                    # files
                     for p in scan_result[arch].to_vault:
                         for f in scan_result[arch].to_vault[p]:
                             package.delete(merged_packages[arch], p, f)
diff --git a/calm/uploads.py b/calm/uploads.py
index 10b5514..59c3d70 100644
--- a/calm/uploads.py
+++ b/calm/uploads.py
@@ -158,6 +158,9 @@ def scan(m, all_packages, arch, args):
                 elif os.path.getsize(fn) != 0:
                     logging.error("remove file %s is not empty" % fn)
                     error = True
+                elif f == 'setup.hint':
+                    logging.error("remove file %s is not permitted" % fn)
+                    error = True
                 else:
                     vault[relpath].append(f[1:])
                     remove_success.append(fn)