diff options
| author | Paul Nasrat <pnasrat@redhat.com> | 2005-09-01 20:37:07 +0000 |
|---|---|---|
| committer | Paul Nasrat <pnasrat@redhat.com> | 2005-09-01 20:37:07 +0000 |
| commit | 2d11ad830799b22191fdd0236166a327550c8bd1 (patch) | |
| tree | c04ff639a2d13dd3e25e2b21ef580e2f0988676f /whiteout.py | |
| parent | bc80e3ec41c489b37c46415176181933742bfb0a (diff) | |
| download | anaconda-2d11ad830799b22191fdd0236166a327550c8bd1.tar.gz anaconda-2d11ad830799b22191fdd0236166a327550c8bd1.tar.xz anaconda-2d11ad830799b22191fdd0236166a327550c8bd1.zip | |
whiteout and macros for correct sorting
Diffstat (limited to 'whiteout.py')
| -rw-r--r-- | whiteout.py | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/whiteout.py b/whiteout.py index 2c6280091..c6df6f67e 100644 --- a/whiteout.py +++ b/whiteout.py @@ -14,23 +14,23 @@ log = logging.getLogger("anaconda") # set DB_PRIVATE to make rpm happy... do it in here since we include # this with all of the useful rpm bits -rpm.addMacro("__dbi_cdb", "create private mpool mp_mmapsize=16Mb mp_size=1Mb") - -# assuming that SELinux is set up, tell rpm where to pull file contexts from -if flags.selinux: - for dir in ("/tmp/updates", "/mnt/source/RHupdates", - "/etc/selinux/targeted/contexts/files", - "/etc/security/selinux/src/policy/file_contexts", - "/etc/security/selinux"): - fn = "%s/file_contexts" %(dir,) - if os.access(fn, os.R_OK): - break - rpm.addMacro("__file_context_path", fn) - log.info("setting file_context_path to %s" %(fn,)) -else: - log.info("setting file_context_path to nil") - rpm.addMacro("__file_context_path", "%{nil}") +#rpm.addMacro("__dbi_cdb", "create private mpool mp_mmapsize=16Mb mp_size=1Mb") +## assuming that SELinux is set up, tell rpm where to pull file contexts from +#if flags.selinux: +# for dir in ("/tmp/updates", "/mnt/source/RHupdates", +# "/etc/selinux/targeted/contexts/files", +# "/etc/security/selinux/src/policy/file_contexts", +# "/etc/security/selinux"): +# fn = "%s/file_contexts" %(dir,) +# if os.access(fn, os.R_OK): +# break +# rpm.addMacro("__file_context_path", fn) +# log.info("setting file_context_path to %s" %(fn,)) +#else: +# log.info("setting file_context_path to nil") +# rpm.addMacro("__file_context_path", "%{nil}") +# whiteout=""" pango-gtkbeta-devel>pango-gtkbeta\ XFree86>Mesa \ @@ -75,6 +75,7 @@ whiteout=""" xemacs>xemacs-sumo \ ncurses>gpm \ cyrus-sasl>openldap \ + lvm2>kernel \ initscripts>kernel \ initscripts>kernel-smp \ rpm-libs>rpm \ @@ -86,9 +87,9 @@ whiteout=""" nautilus>nautilus-cd-burner """ -rpm.addMacro("_dependency_whiteout", whiteout) +#rpm.addMacro("_dependency_whiteout", whiteout) # ts coloring, more hacks to workaround #92285 -if (rhpl.arch.canonArch.startswith("ppc64") or - rhpl.arch.canonArch in ("s390x", "sparc64", "x86_64", "ia64")): - rpm.addMacro("_transaction_color", "3") +#if (rhpl.arch.canonArch.startswith("ppc64") or +# rhpl.arch.canonArch in ("s390x", "sparc64", "x86_64", "ia64")): +# rpm.addMacro("_transaction_color", "3") |