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

* ansgar/fix-acl:
  dak/admin.py: make 'keyring list-(binary|source)' work with new ACLs

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

diff --git a/daklib/fstransactions.py b/daklib/fstransactions.py
index 33f59c8c570072b989ab7cca301fc664c4c73ba5..eb4874a1083ef083781270480165a77dfb1e975a 100644 (file)
--- a/daklib/fstransactions.py
+++ b/daklib/fstransactions.py
@@ -122,7 +122,7 @@ class FilesystemTransaction(object):
     def __init__(self):
         self.actions = []
 
-    def copy(self, source, destination, link=True, symlink=False, mode=None):
+    def copy(self, source, destination, link=False, symlink=False, mode=None):
         """copy C{source} to C{destination}
 
         @type  source: str

diff --git a/daklib/utils.py b/daklib/utils.py
index 03cd589463c5e81908529c8d8ed17927d6082abc..63d8f471e6a773f9d4fe0ba70a6fe218707ad058 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -1503,7 +1503,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
 
 ################################################################################