Strip contrib/non-free from source names

[dak.git] / daklib / utils.py

diff --git a/daklib/utils.py b/daklib/utils.py
index ec9296527934cf2abd32a47e8a9c1a6111f37375..abe8f52b87cbff1adb4d23cdd7692145ef13f92a 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -1513,7 +1513,8 @@ def temp_dirname(parent=None, prefix="dak", suffix="", mode=None, group=None):
     if mode:
         os.chmod(tfname, mode)
     if group:
-        os.chown(tfname, -1, group)
+        gid = grp.getgrnam(group).gr_gid
+        os.chown(tfname, -1, gid)
     return tfname
 
 ################################################################################
@@ -1836,7 +1837,7 @@ def check_reverse_depends(removals, suite, arches=None, session=None, cruft=Fals
                 component, = session.query(Component.component_name) \
                     .join(Component.overrides) \
                     .filter(Override.suite == overridesuite) \
-                    .filter(Override.package == source) \
+                    .filter(Override.package == re.sub('/(contrib|non-free)$', '', source)) \
                     .join(Override.overridetype).filter(OverrideType.overridetype == 'dsc') \
                     .first()
                 if component != "main":