RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 25-Jun-2009 14:38:49
Branch: HEAD Handle: 2009062512384801
Modified files:
rpm CHANGES
rpm/lib rpmts.c
Log:
- selinux: fix: disabler bit toggle sense was inverted.
Summary:
Revision Changes Path
1.3032 +1 -0 rpm/CHANGES
2.171 +4 -4 rpm/lib/rpmts.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3031 -r1.3032 CHANGES
--- rpm/CHANGES 22 Jun 2009 00:25:56 -0000 1.3031
+++ rpm/CHANGES 25 Jun 2009 12:38:48 -0000 1.3032
@@ -1,5 +1,6 @@
5.2b1 -> 5.3a1
+ - jbj: selinux: fix: disabler bit toggle sense was inverted.
- jbj: js: add getters/setters to handle defvar() variables.
- jbj: js: add methods and unit tests for the Aug class.
- jbj: augtool: finish proof-of-concept embedding. stdout capture todo++.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.c
============================================================================
$ cvs diff -u -r2.170 -r2.171 rpmts.c
--- rpm/lib/rpmts.c 15 May 2009 13:40:58 -0000 2.170
+++ rpm/lib/rpmts.c 25 Jun 2009 12:38:49 -0000 2.171
@@ -1244,9 +1244,9 @@
if (ts != NULL) {
transFlags = ts->transFlags;
if (rpmtsSELinuxEnabled(ts) > 0)
- transFlags |= RPMTRANS_FLAG_NOCONTEXTS;
- else
transFlags &= ~RPMTRANS_FLAG_NOCONTEXTS;
+ else
+ transFlags |= RPMTRANS_FLAG_NOCONTEXTS;
}
return transFlags;
}
@@ -1257,9 +1257,9 @@
if (ts != NULL) {
otransFlags = ts->transFlags;
if (rpmtsSELinuxEnabled(ts) > 0)
- transFlags |= RPMTRANS_FLAG_NOCONTEXTS;
- else
transFlags &= ~RPMTRANS_FLAG_NOCONTEXTS;
+ else
+ transFlags |= RPMTRANS_FLAG_NOCONTEXTS;
ts->transFlags = transFlags;
}
return otransFlags;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
