mangle: Fix removing (%) flags that are disabled

Closes: #43 Signed-off-by: Michał Górny <mgorny@gentoo.org>
projg2 · Sep 22, 2023 · e7135e9 · e7135e9
1 parent cdc6082
commit e7135e9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/flaggie/mangle.py b/flaggie/mangle.py
@@ -319,21 +319,21 @@ class shared:
             matched = False
 
         def filter_by_full(flag: str) -> bool:
-            if flag == full_name:
+            if flag.lstrip("-") == full_name:
                 logging.debug(f"Removing {flag}")
                 shared.matched = True
                 return False
             return True
 
         def filter_by_prefix(flag: str) -> bool:
-            if flag.startswith(f"{prefix_lc}_"):
+            if flag.lstrip("-").startswith(f"{prefix_lc}_"):
                 logging.debug(f"Removing {flag}")
                 shared.matched = True
                 return False
             return True
 
         def filter_by_name(flag: str) -> bool:
-            if flag == name:
+            if flag.lstrip("-") == name:
                 logging.debug(f"Removing {prefix}: {flag}")
                 shared.matched = True
                 return False

diff --git a/test/test_mangle.py b/test/test_mangle.py
@@ -378,8 +378,8 @@ def test_remove_flag(package):
                          "",
                          f"{package} foo bar GROUP: foo",
                          "dev-foo/bar foo",
-                         f"{package} baz foo group_foo",
-                         f"{package} foo",
+                         f"{package} baz -foo group_foo",
+                         f"{package} -foo",
                          ])
     remove_flag(config, package, None, "foo")
     assert get_modified_line_nos(config[0]) == {2, 4}
@@ -396,10 +396,10 @@ def test_remove_flag(package):
 def test_remove_flag_in_group(package):
     config = get_config(["*/* foo GROUP: foo",
                          "",
-                         f"{package} foo bar GROUP: foo bar GROUP: foo",
+                         f"{package} foo bar GROUP: foo bar GROUP: -foo",
                          "dev-foo/bar foo",
                          f"{package} baz foo group_foo",
-                         f"{package} group_foo GROUP: foo",
+                         f"{package} -group_foo GROUP: foo",
                          ])
     remove_flag(config, package, "group", "foo")
     assert get_modified_line_nos(config[0]) == {2, 4}
@@ -416,7 +416,7 @@ def test_remove_flag_in_group(package):
 def test_remove_all_in_group(package):
     config = get_config(["*/* foo GROUP: foo",
                          "",
-                         f"{package} foo bar GROUP: foo bar GROUP: foo",
+                         f"{package} foo bar GROUP: foo -bar GROUP: foo",
                          "dev-foo/bar foo",
                          f"{package} baz foo group_foo",
                          f"{package} group_foo GROUP: foo",
@@ -436,10 +436,10 @@ def test_remove_all_in_group(package):
 def test_remove_all(package):
     config = get_config(["*/* foo GROUP: foo",
                          "",
-                         f"{package} foo bar GROUP: foo bar GROUP: foo",
+                         f"{package} foo -bar GROUP: foo bar GROUP: foo",
                          "dev-foo/bar foo",
-                         f"{package} baz foo group_foo",
-                         f"{package} group_foo GROUP: foo",
+                         f"{package} baz -foo group_foo",
+                         f"{package} group_foo GROUP: -foo",
                          ])
     remove_flag(config, package, None, None)
     assert get_modified_line_nos(config[0]) == set()