diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2016-05-19 15:15:51 +0300 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2016-06-21 22:21:22 +0300 |
| commit | c859c2726d16002ec19fefa2f42f7754c77a0eda (patch) | |
| tree | 047c4c53b5cbbea2795ff19b0bdd33f6c452aae7 | |
| parent | dcc552728a8dd6e52409a84f31faa5383b57bcc8 (diff) | |
Removing setup.hint files isn't allowed
Removing a package doesn't make much sense currently.
We can't remove a package when it has been replaced by another one, all we
can do is replace it with an empty, obsolete one which depends on it's
replacement, so existing installs are updated to that.
Removing a package which is no longer relevant (i.e. an old soversion of a
shared library which has no users left) is permissible, but the files it
contains will linger forever in any existing installs.
| -rwxr-xr-x | calm/calm.py | 3 | ||||
| -rw-r--r-- | 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) |