summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2002-10-08 21:32:45 +0000
committerJeremy Katz <katzj@redhat.com>2002-10-08 21:32:45 +0000
commitce0930ae0677cf36339607ef3a38c8d985c01de3 (patch)
treeea5560a84a09aca139ebf7ccd2a3edfd8873be70 /scripts
parentcfda696bbc8df635aaae7eae53b4b056e4e3fab6 (diff)
downloadanaconda-ce0930ae0677cf36339607ef3a38c8d985c01de3.tar.gz
anaconda-ce0930ae0677cf36339607ef3a38c8d985c01de3.tar.xz
anaconda-ce0930ae0677cf36339607ef3a38c8d985c01de3.zip
we're moving forward to rpm 4.1...
tagged before this commit as before-rpm-4_1
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/check-repository.py2
-rw-r--r--scripts/dumphdrlist.py2
-rwxr-xr-xscripts/pkgorder2
-rwxr-xr-xscripts/upd-instroot12
4 files changed, 9 insertions, 9 deletions
diff --git a/scripts/check-repository.py b/scripts/check-repository.py
index 181b65bb1..4d3b76004 100755
--- a/scripts/check-repository.py
+++ b/scripts/check-repository.py
@@ -33,7 +33,7 @@ sys.path.append('/usr/lib/anaconda')
from comps import ComponentSet, HeaderList
import os
-import rpm404 as rpm
+import rpm
FILENAME = 1000000
diff --git a/scripts/dumphdrlist.py b/scripts/dumphdrlist.py
index 6ca2e6a1d..5e49a8323 100644
--- a/scripts/dumphdrlist.py
+++ b/scripts/dumphdrlist.py
@@ -21,7 +21,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
-import rpm404 as rpm
+import rpm
import os
import sys
diff --git a/scripts/pkgorder b/scripts/pkgorder
index 65a22852f..9e65458a5 100755
--- a/scripts/pkgorder
+++ b/scripts/pkgorder
@@ -3,7 +3,7 @@
import sys
import os
import os.path
-import rpm404 as rpm
+import rpm
import string
# set up rpm dependency whiteouts
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 6d4279bbf..15690904a 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -101,8 +101,8 @@ PACKAGES="glibc glibc-common setup openssl python python2 newt libtermcap zlib
ash kon2 e2fsprogs util-linux raidtools popt mount procps rpm
XFree86 Xconfigurator anaconda anaconda-runtime kudzu-devel
kudzu hwdata db3 bzip2 bzip2-libs dosfstools pciutils
- reiserfs-utils parted busybox-anaconda rpm404-python anaconda-help booty
- hdparm lvm librpm404 rhpl libxml2 libxml2-python rdate"
+ reiserfs-utils parted busybox-anaconda rpm-python anaconda-help booty
+ hdparm lvm rhpl libxml2 libxml2-python rdate"
if [ $ARCH = x86_64 ]; then
PACKAGES="$PACKAGES libgcc libstdc++"
@@ -133,7 +133,7 @@ PACKAGESGR="anaconda XFree86-libs imlib libpng libtiff libjpeg
XFree86-ISO8859-9-75dpi-fonts esound audiofile libgnome
XFree86-100dpi-fonts fonts-ISO8859-2 fonts-ISO8859-9
XFree86-xfs e2fsprogs fileutils glibc glibc-common rsh less
- ftp readline gzip popt specspo util-linux rpm librpm404
+ ftp readline gzip popt specspo util-linux rpm
open grep net-tools traceroute tar procps textutils sed
ncurses bash cpio mt-st iputils sh-utils
XFree86 Xconfigurator gnome-python2 pygtk2 gdk-pixbuf
@@ -303,9 +303,9 @@ usr/$LIBDIR/libdb1*
usr/$LIBDIR/libnewt*
usr/$LIBDIR/libparted*
usr/$LIBDIR/libpopt*
-usr/$LIBDIR/librpm-*4.0.4.so*
-usr/$LIBDIR/librpmdb*4.0.4.so*
-usr/$LIBDIR/librpmio*4.0.4.so*
+usr/$LIBDIR/librpm-*4.1.so*
+usr/$LIBDIR/librpmdb*4.1.so*
+usr/$LIBDIR/librpmio*4.1.so*
usr/$LIBDIR/libslang*
usr/$LIBDIR/libstdc++*
usr/$LIBDIR/libxml2.so*