[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20181020-18-ga4a44a4
jturney@sourceware.org
jturney@sourceware.org
Wed May 29 18:01:00 GMT 2019
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=a4a44a4f8805c1f3574e35282d2ae1888737dff0
commit a4a44a4f8805c1f3574e35282d2ae1888737dff0
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Mar 2 22:23:30 2018 +0000
Update hint parsing tests
Use a separate expected file for each pvr.hint
Add testing of override.hint parsing
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=9088dbed4223bfc2ba47c1971c44d7b699268ef4
commit 9088dbed4223bfc2ba47c1971c44d7b699268ef4
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Mar 1 16:13:01 2018 +0000
Remove reading setup.hint files
Diff:
---
calm/package.py | 5 ++---
calm/uploads.py | 3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/calm/package.py b/calm/package.py
index ebec84a..95ea7cb 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -162,7 +162,7 @@ def clean_hints(p, hints, warnings):
#
# read a single package
#
-def read_package(packages, basedir, dirpath, files, remove=[], upload=False):
+def read_package(packages, basedir, dirpath, files, remove=[]):
relpath = os.path.relpath(dirpath, basedir)
warnings = False
@@ -305,8 +305,7 @@ def read_package(packages, basedir, dirpath, files, remove=[], upload=False):
ovr = vr
version_hints[ovr] = pvr_hint
- if hint_fn:
- hint_files[ovr] = hint_fn
+ hint_files[ovr] = hint_fn
actual_tars[ovr] = tars[vr]
# ignore dotfiles
diff --git a/calm/uploads.py b/calm/uploads.py
index 2f84911..69951cf 100644
--- a/calm/uploads.py
+++ b/calm/uploads.py
@@ -257,8 +257,7 @@ def scan(m, all_packages, arch, args):
# read and validate package
if files:
- # strict means we consider warnings as fatal for upload
- if package.read_package(packages, m.homedir(), dirpath, files, remove=removed_files, upload=True):
+ if package.read_package(packages, m.homedir(), dirpath, files, remove=removed_files):
error = True
# always consider timestamp as checked during a dry-run, so it is never
More information about the Cygwin-apps-cvs
mailing list