[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20190530-16-g4d0d596
jturney-9JcytcrH/[email protected]
| Newsgroups | gmane.os.cygwin.cvs.apps |
|---|---|
| Message-ID | <[email protected]> |
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=4d0d596e575b5c8c2b4b2b18645a824ebde92d28 commit 4d0d596e575b5c8c2b4b2b18645a824ebde92d28 Author: Jon Turney <[email protected]> Date: Sat Jun 8 20:18:12 2019 +0100 Fix noarch vaulting after 5fbe4c85 Fix noarch vaulting after 5fbe4c85. Only remove a path from movelist once, even when the movelist contains multiple files at that path. Diff: --- calm/calm.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/calm/calm.py b/calm/calm.py index dc63eea..0ff63ec 100755 --- a/calm/calm.py +++ b/calm/calm.py @@ -323,13 +323,13 @@ def remove_stale_packages(args, packages): # for each arch. # # de-duplicate these package moves, as rather awkward workaround for that - moved_list = [] + moved_list = set() def dedup(path, f): for prefix in ['noarch', 'src']: if path.startswith(prefix): to_vault[prefix].add(path, f) - moved_list.append(path) + moved_list.add(path) to_vault[common_constants.ARCHES[0]].map(dedup)