[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20200401-6-g37d25a2

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

commit 37d25a2dda78ee53344bf2c276d9595e1e2a6d98
Author: Jon Turney <[email protected]>
Date:   Sun Apr 12 14:44:11 2020 +0100

    Check for redirects when fixing homepage: in src.hint
    
    Check for redirects when fixing homepage: in src.hint, and fix http: to
    https: redirects

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

commit bbd02003fa1ca8dc2587a17f51c30a29294db6fc
Author: Jon Turney <[email protected]>
Date:   Wed Apr 8 20:42:26 2020 +0100

    Restore mksetupini producing output for an empty relarea

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

commit 9549cf38735481bac6611c15fc410dd96d1dfa40
Author: Jon Turney <[email protected]>
Date:   Wed Apr 8 18:09:16 2020 +0100

    Configure 'core.sharedrepository = all' for all gitolite repos
    
    This ensures that they are world-readable, even when pushed to directly
    by a sourceware account (as ssh seems to set 0077 umask by default)

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

commit 9a453a2f519a46fcff15a754f9d9f957d1fee722
Author: Jon Turney <[email protected]>
Date:   Tue Apr 7 21:48:42 2020 +0100

    Improve homepage: hint fixing

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

commit 468cf44c6cf4a42c351051c11518a53d766bc367
Author: Jon Turney <[email protected]>
Date:   Sun Apr 5 21:59:49 2020 +0100

    Discard hints which will be ignored after copying for source only packages


Diff:
---
 calm/uploads.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/calm/uploads.py b/calm/uploads.py
index a334066..06a8472 100644
--- a/calm/uploads.py
+++ b/calm/uploads.py
@@ -189,8 +189,8 @@ def scan(m, all_packages, arch, args):
                     files.append(new)
                     if f.replace('-src', '') not in files:
                         logging.info("discarding '%s'" % (old))
-                        files.remove(os.path.join(dirpath, old))
-                        remove.append(old)
+                        files.remove(old)
+                        remove.append(os.path.join(dirpath, old))
 
                 # see if we can fix-up missing homepage: in -src.hint file
                 if (new in files):