From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 71169 invoked by alias); 15 Jun 2016 16:47:28 -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 71095 invoked by uid 9795); 15 Jun 2016 16:47:28 -0000 Date: Wed, 15 Jun 2016 16:47:00 -0000 Message-ID: <20160615164727.71064.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 60c749590746bf7ffc6222bf17e0191f025ca017 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: dcc552728a8dd6e52409a84f31faa5383b57bcc8 X-Git-Newrev: 60c749590746bf7ffc6222bf17e0191f025ca017 X-SW-Source: 2016-q2/txt/msg00026.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=60c749590746bf7ffc6222bf17e0191f025ca017 commit 60c749590746bf7ffc6222bf17e0191f025ca017 Author: Jon Turney 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)