From: Chris Lumens <clumens@xxxxxxxxxx>
Signed-off-by: David Cantrell <dcantrell@xxxxxxxxxx>
---
Makefile | 4 ++--
anaconda | 6 ------
anaconda.spec | 3 +--
runpychecker.sh | 4 ++--
scripts/upd-instroot | 3 +--
5 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index deacdef..eed63f6 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ VERSION := $(shell awk '/Version:/ { print $$2 }' anaconda.spec)
RELEASE := $(shell awk '/Release:/ { print $$2 }' anaconda.spec)
CVSROOT ?= ${CVSROOT:-$(shell cat CVS/Root 2>/dev/null)}
-SUBDIRS = isys loader po \
+SUBDIRS = isys loader po booty \
textw utils scripts bootdisk installclasses \
iw pixmaps command-stubs ui docs
# fonts aren't on s390/s390x
@@ -40,7 +40,7 @@ ifneq (,$(filter i386 x86_64,$(ARCH)))
SUBDIRS += gptsync
endif
-PYCHECKERPATH=isys:textw:iw:installclasses:/usr/lib/booty:/usr/share/system-config-date
+PYCHECKERPATH=isys:textw:iw:installclasses:/usr/share/system-config-date
PYCHECKEROPTS=-F pycheckrc-for-anaconda
CATALOGS = po/anaconda.pot
diff --git a/anaconda b/anaconda
index 6ded5db..4e328b8 100755
--- a/anaconda
+++ b/anaconda
@@ -352,12 +352,6 @@ def setupPythonPath():
sys.path.insert(1, '/usr/lib/anaconda/textw')
sys.path.insert(2, '/usr/lib/anaconda/iw')
- if (os.path.exists('booty')):
- sys.path.append('booty')
- sys.path.append('booty/edd')
- else:
- sys.path.append('/usr/lib/booty')
-
sys.path.append('/usr/share/system-config-date')
def addPoPath(dir):
diff --git a/anaconda.spec b/anaconda.spec
index 6de4f6b..9a07e04 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -42,7 +42,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%define iscsiver 6.2.0.870-3
BuildRequires: audit-libs-devel
-BuildRequires: booty
BuildRequires: bzip2-devel
BuildRequires: device-mapper-devel >= %{dmver}
BuildRequires: e2fsprogs-devel >= %{e2fsver}
@@ -83,7 +82,6 @@ Requires: policycoreutils
Requires: rpm-python >= %{rpmpythonver}
Requires: comps-extras
Requires: rhpl >= %{rhplver}
-Requires: booty
Requires: parted >= %{partedver}
Requires: pyparted >= %{pypartedver}
Requires: yum >= %{yumver}
@@ -144,6 +142,7 @@ Obsoletes: anaconda-images <= 10
Provides: anaconda-images = %{version}-%{release}
Obsoletes: anaconda-runtime < %{version}-%{release}
Provides: anaconda-runtime = %{version}-%{release}
+Obsoletes: booty
%description
The anaconda package contains the program which was used to install your
diff --git a/runpychecker.sh b/runpychecker.sh
index 2a330ef..0330174 100755
--- a/runpychecker.sh
+++ b/runpychecker.sh
@@ -37,7 +37,7 @@ if [ "`tail -c 1 pychecker-false-positives`" == "`echo`" ]; then
exit 1
fi
-export PYTHONPATH="isys:textw:iw:installclasses:/usr/lib/booty:/usr/share/system-config-date"
+export PYTHONPATH="isys:textw:iw:installclasses:/usr/share/system-config-date"
pychecker --only --limit 1000 \
--maxlines 500 --maxargs 20 --maxbranches 80 --maxlocals 60 --maxreturns 20 \
@@ -45,7 +45,7 @@ pychecker --only --limit 1000 \
--no-import --no-miximport --no-pkgimport --no-reimport \
--no-argsused --no-varargsused --no-override \
$NON_STRICT_OPTIONS \
- anaconda anaconda *.py textw/*.py iw/*.py installclasses/*.py isys/*.py | \
+ anaconda anaconda *.py textw/*.py iw/*.py installclasses/*.py isys/*.py booty/*.py booty/*/*.py | \
egrep -v "`cat $FALSE_POSITIVES | tr '\n' '|'`" > pychecker-log
if [ -s pychecker-log ]; then
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index a26a523..b7dfca2 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -152,7 +152,7 @@ die () {
PACKAGES="GConf2 NetworkManager ORBit2 PolicyKit acl anaconda
anaconda-yum-plugins at-spi atk attr audit-libs bash bitmap-fonts-cjk
- booty btrfs-progs busybox-anaconda bzip2 bzip2-libs cairo cjkunifonts-uming
+ btrfs-progs busybox-anaconda bzip2 bzip2-libs cairo cjkunifonts-uming
comps-extras coreutils cpio cracklib cracklib-dicts cracklib-python
cryptsetup-luks db4 dbus dbus-python dejavu-sans-fonts
dejavu-sans-mono-fonts device-mapper
@@ -496,7 +496,6 @@ usr/lib/anaconda-runtime
usr/lib/anaconda/installclasses
usr/lib/anaconda/iw
usr/lib/anaconda/textw
-usr/lib/booty
usr/lib/kernel-wrapper
usr/lib/locale
usr/lib/python?.?/site-packages/bugzilla*
--
1.6.1.3
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
