WIP: Consistency

Ensure a delegation only has paths or path_hash_prefixes in roledb Signed-off-by: Joshua Lock <[email protected]>
theupdateframework · Mar 30, 2020 · 74d6973 · 74d6973
1 parent 5ea1f63
commit 74d6973
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/tuf/repository_tool.py b/tuf/repository_tool.py
@@ -2334,13 +2334,14 @@ def delegate(self, rolename, public_keys, paths, threshold=1,
                 'terminating': terminating,
                 'paths': list(roleinfo['paths'].keys())}
 
+    # A role in a delegations must list either 'path_hash_prefixes'
+    # or 'paths'.
     if paths:
       roleinfo['paths'] = paths
+      del roleinfo['path_hash_prefixes']
 
     if path_hash_prefixes:
       roleinfo['path_hash_prefixes'] = path_hash_prefixes
-      # A role in a delegations must list either 'path_hash_prefixes'
-      # or 'paths'.
       del roleinfo['paths']
 
     current_roleinfo['delegations']['roles'].append(roleinfo)