From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 69058 invoked by alias); 9 May 2016 13:50:01 -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 69026 invoked by uid 9795); 9 May 2016 13:50:00 -0000 Date: Mon, 09 May 2016 13:50:00 -0000 Message-ID: <20160509135000.68998.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 7dc8fae9002cec3048c14b9e351a1b289afc0d53 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 1d2e982935cafa1dacb323f0238d892087446746 X-Git-Newrev: 7dc8fae9002cec3048c14b9e351a1b289afc0d53 X-SW-Source: 2016-q2/txt/msg00015.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=7dc8fae9002cec3048c14b9e351a1b289afc0d53 commit 7dc8fae9002cec3048c14b9e351a1b289afc0d53 Author: Jon Turney Date: Sun May 8 12:37:08 2016 +0000 Add noarch support - Unfold process() as we need to validate both x86 and x86_64 before we can move uploaded noarch packages to relarea - Add arch as an argument to upload.scan(), package.write_setup_ini(), pkg2html.update_package_listing() etc. rather than passing it around in args - Use paths relative to relarea, rather than relarea/arch - Generalize package merge to merge more than 2 sets of packages - Remove uploads-scan script used in working-up - Move the !reminder-timestamp file up to maintainer home dir - Add a noarch package to testdata - Update tests Diff: --- uploads.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/uploads.py b/uploads.py index 137b159..afb183b 100644 --- a/uploads.py +++ b/uploads.py @@ -83,7 +83,7 @@ def scan(m, all_packages, arch, args): relpath = os.path.relpath(dirpath, m.homedir()) # skip uninteresting directories - if (not files) or (relpath == 'release'): + if (not files) or (relpath == os.path.join(arch, 'release')): continue logging.debug('reading uploads from %s' % dirpath)