Merge remote-tracking branch 'ansgar/fix-unpriv' into merge

* ansgar/fix-unpriv:
  daklib/utils.py: lookup gid for group.
  daklib/checks.py: typo: unpribgroup → unprivgroup

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/daklib/checks.py b/daklib/checks.py
index 25cbb8f0ad6a493e90ba5b89366b0e54addebff7..8111ef7555e1198729a7f7cf1fbda4b009245f78 100644 (file)
--- a/daklib/checks.py
+++ b/daklib/checks.py
@@ -604,7 +604,7 @@ class LintianCheck(Check):
 
         changespath = os.path.join(upload.directory, changes.filename)
         try:
-            if cnf.unpribgroup:
+            if cnf.unprivgroup:
                 cmd = "sudo -H -u {0} -- /usr/bin/lintian --show-overrides --tags-from-file {1} {2}".format(cnf.unprivgroup, temp_filename, changespath)
             else:
                 cmd = "/usr/bin/lintian --show-overrides --tags-from-file {0} {1}".format(temp_filename, changespath)

diff --git a/daklib/utils.py b/daklib/utils.py
index 8a160356f721f0ded72533d5dfed40207fb41c77..03cd589463c5e81908529c8d8ed17927d6082abc 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -27,6 +27,7 @@ import datetime
 import email.Header
 import os
 import pwd
+import grp
 import select
 import socket
 import shutil
@@ -1468,7 +1469,8 @@ def temp_filename(directory=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 (tfd, tfname)
 
 ################################################################################