diff options
Diffstat (limited to 'rdiff-backup/rdiff_backup')
-rw-r--r-- | rdiff-backup/rdiff_backup/cmodule.c | 4 | ||||
-rw-r--r-- | rdiff-backup/rdiff_backup/rpath.py | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/rdiff-backup/rdiff_backup/cmodule.c b/rdiff-backup/rdiff_backup/cmodule.c index f6a44a3..5fc61e0 100644 --- a/rdiff-backup/rdiff_backup/cmodule.c +++ b/rdiff-backup/rdiff_backup/cmodule.c @@ -371,6 +371,7 @@ static PyObject *acl_unquote(PyObject *self, PyObject *args) /* ------------- lchown taken from Python's posixmodule.c -------------- */ /* duplicate here to avoid v2.3 requirement */ +#ifdef HAVE_LCHOWN static PyObject * posix_error_with_allocated_filename(char* name) { @@ -398,6 +399,7 @@ posix_lchown(PyObject *self, PyObject *args) Py_INCREF(Py_None); return Py_None; } +#endif /* HAVE_LCHOWN */ /* ------------- Python export lists -------------------------------- */ @@ -411,8 +413,10 @@ static PyMethodDef CMethods[] = { "Quote string, escaping non-printables"}, {"acl_unquote", acl_unquote, METH_VARARGS, "Unquote string, producing original input to quote"}, +#ifdef HAVE_LCHOWN {"lchown", posix_lchown, METH_VARARGS, "Like chown, but don't follow symlinks"}, +#endif /* HAVE_LCHOWN */ {NULL, NULL, 0, NULL} }; diff --git a/rdiff-backup/rdiff_backup/rpath.py b/rdiff-backup/rdiff_backup/rpath.py index aa411a0..b9e84ca 100644 --- a/rdiff-backup/rdiff_backup/rpath.py +++ b/rdiff-backup/rdiff_backup/rpath.py @@ -782,7 +782,12 @@ class RPath(RORPath): def chown(self, uid, gid): """Set file's uid and gid""" - self.conn.C.lchown(self.path, uid, gid) + if self.issym(): + try: self.conn.C.lchown(self.path, uid, gid) + except AttributeError: + log.Log("Warning: lchown missing, cannot change ownership " + "of symlink " + self.path, 2) + else: os.chown(self.path, uid, gid) self.data['uid'] = uid self.data['gid'] = gid |