Strip contrib/non-free from source names

[dak.git] / daklib / utils.py

diff --git a/daklib/utils.py b/daklib/utils.py
index fd50cb1c7430a6f852131377bdd7bc1556262e58..abe8f52b87cbff1adb4d23cdd7692145ef13f92a 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -43,6 +43,7 @@ import email as modemail
 import subprocess
 import ldap
 
+import daklib.config as config
 from dbconn import DBConn, get_architecture, get_component, get_suite, \
                    get_override_type, Keyring, session_wrapper, \
                    get_active_keyring_paths, get_primary_keyring_path, \
@@ -1512,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
 
 ################################################################################
@@ -1550,14 +1552,7 @@ def get_changes_files(from_dir):
 
 ################################################################################
 
-apt_pkg.init()
-
-Cnf = apt_pkg.Configuration()
-if not os.getenv("DAK_TEST"):
-    apt_pkg.read_config_file_isc(Cnf,default_config)
-
-if which_conf_file() != default_config:
-    apt_pkg.read_config_file_isc(Cnf,which_conf_file())
+Cnf = config.Config().Cnf
 
 ################################################################################
 
@@ -1842,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":