rpms/rpm/devel rpm-4.4.1-matchpathcon.patch,1.4,1.5
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue May 3 19:56:05 UTC 2005
Author: pnasrat
Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18285
Modified Files:
rpm-4.4.1-matchpathcon.patch
Log Message:
doh
rpm-4.4.1-matchpathcon.patch:
build/Makefile.am | 1 +
build/files.c | 27 ++++++++++++++-------------
lib/rpmfi.c | 13 ++++++-------
lib/rpminstall.c | 14 ++++----------
lib/verify.c | 30 ++++++++++++------------------
python/Makefile.am | 1 +
python/rpmts-py.c | 13 ++++---------
7 files changed, 42 insertions(+), 57 deletions(-)
Index: rpm-4.4.1-matchpathcon.patch
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm-4.4.1-matchpathcon.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpm-4.4.1-matchpathcon.patch 3 May 2005 19:42:01 -0000 1.4
+++ rpm-4.4.1-matchpathcon.patch 3 May 2005 19:56:02 -0000 1.5
@@ -217,7 +217,7 @@
- fn = _free(fn);
+ const char *fn = rpmGetPath("%{?_install_file_context_path}", NULL);
+ if (fn != NULL && *fn != '\0') {
-+ matchpatcon_init(fn);
++ matchpathcon_init(fn);
}
- sx = rpmsxFree(sx);
+ fn = _free(fn);
More information about the fedora-cvs-commits
mailing list