Also remove versions which have no packages left, after expiry

1 files changed, 4 insertions, 1 deletions

diff --git a/calm/package.py b/calm/package.py
index 9cb5dd1..7575050 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -1075,9 +1075,12 @@ def delete(packages, path, fn):
                 for t in packages[p].tars[vr]:
                     if t == fn:
                         del packages[p].tars[vr][t]
-                    # XXX: should also remove from vermap
                         break
 
+                # if no packages remain for this vr, also remove from vermap
+                if not packages[p].tars[vr]:
+                    packages[p].vermap.pop(vr, None)
+
             for h in packages[p].hint_files:
                 if packages[p].hint_files[h] == fn:
                     del packages[p].hint_files[h]