[calm - Cygwin server-side packaging maintenance script] branch master, updated. 7dc8fae9002cec3048c14b9e351a1b289afc0d53

[calm - Cygwin server-side packaging maintenance script] branch master, updated. 7dc8fae9002cec3048c14b9e351a1b289afc0d53

[jturney]

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

commit 7dc8fae9002cec3048c14b9e351a1b289afc0d53
Author: Jon Turney <jon.turney@dronecode.org.uk>
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)