diff options
author | Jeremy Katz <katzj@redhat.com> | 2007-03-05 19:55:01 +0000 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2007-03-05 19:55:01 +0000 |
commit | 37380c34ff08adc3b883c02cae03487bf322b6b0 (patch) | |
tree | 90105566e112b662895dbc180399be6b80e4241d /whiteout.py | |
parent | 90f17c42ed6b5d737de3bce140c11d86846ab475 (diff) | |
download | anaconda-37380c34ff08adc3b883c02cae03487bf322b6b0.tar.gz anaconda-37380c34ff08adc3b883c02cae03487bf322b6b0.tar.xz anaconda-37380c34ff08adc3b883c02cae03487bf322b6b0.zip |
2007-03-05 Jeremy Katz <katzj@redhat.com>
* whiteout.py: Don't import rpm. We don't use it here. And nuke
other old code too.
Diffstat (limited to 'whiteout.py')
-rw-r--r-- | whiteout.py | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/whiteout.py b/whiteout.py index aacffdbbf..7dc5b1f76 100644 --- a/whiteout.py +++ b/whiteout.py @@ -5,32 +5,12 @@ # import os -import rpm import rhpl.arch from flags import flags import logging 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}") -# whiteout=""" pango-gtkbeta-devel>pango-gtkbeta\ XFree86>Mesa \ @@ -87,10 +67,3 @@ whiteout=""" """ whitetup = map(lambda x: (x.split(">")[0], x.split(">")[1]), whiteout.split()) - -#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") |