From: Eduardo Robles Elvira Date: Fri, 18 Oct 2013 09:07:56 +0000 (+0200) Subject: some unit tests were only failing when run with superuser, because only then chown... X-Git-Tag: v2.2~83 X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=4e433e00de3a17927442b5448f318c792caa6f16;p=python-delta-tar some unit tests were only failing when run with superuser, because only then chown can be called and had not been properly tested --- diff --git a/deltatar/deltatar.py b/deltatar/deltatar.py index 01f6872..1875df5 100644 --- a/deltatar/deltatar.py +++ b/deltatar/deltatar.py @@ -1526,7 +1526,7 @@ class RestoreHelper(object): except KeyError: u = member.uid try: - if member.issym() and hasattr(os, "lchown"): + if member.issym and hasattr(os, "lchown"): os.lchown(dirpath, u, g) else: os.chown(dirpath, u, g) @@ -1630,13 +1630,13 @@ class RestoreHelper(object): ''' Add member dir to be restored at the end ''' - if self.canchown: + if not self.canchown: self._directories.append(DirItem(name=member.name, mode=member.mode, mtime=member.mtime)) else: self._directories.append(DirItem(name=member.name, mode=member.mode, mtime=member.mtime, gname=member.gname, uname=member.uname, - uid=member.uid, gid=member.gid)) + uid=member.uid, gid=member.gid, issym=member.issym())) class DirItem(object): def __init__(self, **kwargs):