- fix: only first "mkdir -p" directory had context set.

CVS patchset: 7102
CVS date: 2004/02/20 11:24:41

diff --git a/CHANGES b/CHANGES
index 6f8025c..d3bebf8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,8 @@
        - fix: set fcontext for "mkdir -p" directories not in packages.
        - fix: setfiles (aka rpmsx.c) dinna handle patterns correctly.
        - establish rpm_script_t before scriptlet exec.
+       - python: add patch to rpm-4_3 to initialize RE contexts.
+       - fix: only first "mkdir -p" directory had context set.
 
 4.2.1 -> 4.2.2:
        - unify signal handling in librpmio, use condvar to deliver signal.

diff --git a/lib/fsm.c b/lib/fsm.c
index dcab166..f720e22 100644 (file)
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -1359,7 +1359,6 @@ static int fsmMkdirs(/*@special@*/ /*@partial@*/ FSM_t fsm)
            if (rc)
                /*@innerbreak@*/ break;
        }
-       sx = rpmsxFree(sx);
        if (rc) break;
 
        /* Save last validated path. */
@@ -1376,6 +1375,7 @@ static int fsmMkdirs(/*@special@*/ /*@partial@*/ FSM_t fsm)
     }
 /*@=boundswrite@*/
     dnli = dnlFreeIterator(dnli);
+    sx = rpmsxFree(sx);
     /*@=observertrans =dependenttrans@*/
 
     fsm->path = path;

diff --git a/rpm.spec.in b/rpm.spec.in
index dd65c8f..441fa81 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -20,7 +20,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.11
+Release: 0.13
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 License: GPL
@@ -482,6 +482,12 @@ exit 0
 %{__includedir}/popt.h
 
 %changelog
+* Fri Feb 20 2004 Jeff Johnson <jbj@jbj.org> 4.3-0.13
+- fix: only first "mkdir -p" directory had context set.
+                                                                                
+* Wed Feb 18 2004 Jeff Johnson <jbj@redhat.com> 4.3-0.12
+- python: add patch to rpm-4_3 to initialize RE contexts.
+
 * Sun Feb 15 2004 Jeff Johnson <jbj@jbj.org> 4.3-0.11
 - fix: set fcontext from pkg when file_contexts doesn't exist (#114040).
 - fix: set fcontext for "mkdir -p" directories not in packages.