diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2022-09-16 18:01:37 +0300 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2022-09-26 14:58:09 +0300 |
| commit | 132284ee7350e59c0f3e9204637cdb933b9b7ebe (patch) | |
| tree | 94d0b9dc228a43cbb66db2c0fda0bad6c0a71f5d | |
| parent | ca35f6a964ae535084a42dfdf085c35e4f4a7c36 (diff) | |
Drop unused remove arg to read_one_package
Unused since d8869d2e removed the need to notice when override.hint was
being removed.
| -rwxr-xr-x | calm/package.py | 9 | ||||
| -rw-r--r-- | calm/uploads.py | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/calm/package.py b/calm/package.py index 1c658e1..dd137fb 100755 --- a/calm/package.py +++ b/calm/package.py @@ -206,10 +206,7 @@ def clean_hints(p, hints, warnings): # (return True if problems, False otherwise) # -def read_package_dir(packages, basedir, dirpath, files, remove=None, upload=False): - if remove is None: - remove = [] - +def read_package_dir(packages, basedir, dirpath, files, upload=False): relpath = os.path.relpath(dirpath, basedir) # the package name is always the directory name @@ -260,7 +257,7 @@ def read_package_dir(packages, basedir, dirpath, files, remove=None, upload=Fals for kind in Kind: # only create a package if there's archives for it to contain if fl[kind]: - result = read_one_package(packages, p, relpath, dirpath, fl[kind] + fl['all'], remove, kind, upload) or result + result = read_one_package(packages, p, relpath, dirpath, fl[kind] + fl['all'], kind, upload) or result # warn about unexpected files, including tarfiles which don't match the # package name @@ -274,7 +271,7 @@ def read_package_dir(packages, basedir, dirpath, files, remove=None, upload=Fals # # read a single package # -def read_one_package(packages, p, relpath, dirpath, files, remove, kind, strict): +def read_one_package(packages, p, relpath, dirpath, files, kind, strict): warnings = False if not re.match(r'^[\w\-._+]*$', p): diff --git a/calm/uploads.py b/calm/uploads.py index 818d065..2f98fe5 100644 --- a/calm/uploads.py +++ b/calm/uploads.py @@ -278,7 +278,7 @@ def scan(scandir, m, all_packages, arch, args): # read and validate package if files: - if package.read_package_dir(packages, homedir, dirpath, files, remove=removed_files, upload=True): + if package.read_package_dir(packages, homedir, dirpath, files, upload=True): error = True # always consider timestamp as checked during a dry-run, so it is never |