The following commit has been merged in the master branch:
commit 2393193c27eb806ea81d54c8a8f066417f4e4dfd
Author: Guillem Jover <guil...@debian.org>
Date: Sun Apr 3 17:32:25 2011 +0200
dpkg: Rename set_selinux_path_context() to tarobject_set_se_context()
This puts it in line with the rest of tarobject filesystem metadata
setters.
diff --git a/src/archives.c b/src/archives.c
index f1dd779..21b06b8 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -269,7 +269,7 @@ tarobject_set_perms(struct tar_entry *te, const char *path,
struct file_stat *st
}
static void
-set_selinux_path_context(const char *matchpath, const char *path, mode_t mode)
+tarobject_set_se_context(const char *matchpath, const char *path, mode_t mode)
{
#ifdef WITH_SELINUX
static int selinux_enabled = -1;
@@ -780,7 +780,7 @@ tarobject(void *ctx, struct tar_entry *ti)
tarobject_set_perms(ti, fnamenewvb.buf, st);
tarobject_set_mtime(ti, fnamenewvb.buf);
- set_selinux_path_context(fnamevb.buf, fnamenewvb.buf, st->mode);
+ tarobject_set_se_context(fnamevb.buf, fnamenewvb.buf, st->mode);
/*
* CLEANUP: Now we have extracted the new object in .dpkg-new (or,
@@ -828,7 +828,7 @@ tarobject(void *ctx, struct tar_entry *ti)
ohshite(_("unable to make backup symlink for `%.255s'"), ti->name);
if (lchown(fnametmpvb.buf,stab.st_uid,stab.st_gid))
ohshite(_("unable to chown backup symlink for `%.255s'"), ti->name);
- set_selinux_path_context(fnamevb.buf, fnametmpvb.buf, stab.st_mode);
+ tarobject_set_se_context(fnamevb.buf, fnametmpvb.buf, stab.st_mode);
} else {
debug(dbg_eachfiledetail,"tarobject nondirectory, `link' backup");
if (link(fnamevb.buf,fnametmpvb.buf))
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
