From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 60193 invoked by alias); 8 Jun 2019 19:23:57 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 60158 invoked by uid 9795); 8 Jun 2019 19:23:57 -0000 Date: Sat, 08 Jun 2019 19:23:00 -0000 Message-ID: <20190608192357.60147.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20190530-16-g4d0d596 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 8118f97177a0ffe74681ebe32ca05436eb3c0c78 X-Git-Newrev: 4d0d596e575b5c8c2b4b2b18645a824ebde92d28 X-SW-Source: 2019-q2/txt/msg00019.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=4d0d596e575b5c8c2b4b2b18645a824ebde92d28 commit 4d0d596e575b5c8c2b4b2b18645a824ebde92d28 Author: Jon Turney 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)