the rpm 4.0.4 python module is now rpm404. import it as rpm whereever we use rpmmodule so that we get rpm 4.0.4 instead of 4.1

16 files changed, 16 insertions, 16 deletions

diff --git a/comps.py b/comps.py
index 81ae8e8d1..85723de77 100644
--- a/comps.py
+++ b/comps.py
@@ -14,7 +14,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-import rpm
+import rpm404 as rpm
 import os
 from string import *
 import types
diff --git a/exception.py b/exception.py
index 5fc4db2af..71c0ef3aa 100644
--- a/exception.py
+++ b/exception.py
@@ -21,7 +21,7 @@ import signal
 import traceback
 import iutil
 import types
-import rpm
+import rpm404 as rpm
 from string import joinfields
 from cPickle import Pickler
 from rhpl.translate import _
diff --git a/floppy.py b/floppy.py
index ca9cecaaf..48f3d802f 100644
--- a/floppy.py
+++ b/floppy.py
@@ -18,7 +18,7 @@ import errno
 import iutil
 import re
 import os
-import rpm
+import rpm404 as rpm
 import kudzu
 from constants import *
 from flags import flags
diff --git a/harddrive.py b/harddrive.py
index 1cfb6dce2..5875b040c 100644
--- a/harddrive.py
+++ b/harddrive.py
@@ -18,7 +18,7 @@ from image import findIsoImages
 import os
 import isys
 import iutil
-import rpm
+import rpm404 as rpm
 import string
 from rhpl.translate import _, cat, N_
 
diff --git a/iw/package_gui.py b/iw/package_gui.py
index 651518bfb..7e4b5fca5 100644
--- a/iw/package_gui.py
+++ b/iw/package_gui.py
@@ -15,7 +15,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-import rpm
+import rpm404 as rpm
 import gui
 import string
 import sys
diff --git a/iw/progress_gui.py b/iw/progress_gui.py
index 87d5c5bed..3c3b01944 100644
--- a/iw/progress_gui.py
+++ b/iw/progress_gui.py
@@ -12,7 +12,7 @@
 #
 
 import string
-import rpm
+import rpm404 as rpm
 import os
 import gui
 import sys
diff --git a/language.py b/language.py
index 2d5d062e0..37bfb9e18 100644
--- a/language.py
+++ b/language.py
@@ -16,7 +16,7 @@
 import os
 import string
 import locale
-import rpm
+import rpm404 as rpm
 
 from rhpl.translate import cat
 from rhpl.simpleconfig import SimpleConfigFile
diff --git a/packages.py b/packages.py
index 744287f5a..be51bcd27 100644
--- a/packages.py
+++ b/packages.py
@@ -15,7 +15,7 @@
 
 import iutil
 import isys
-import rpm
+import rpm404 as rpm
 import os
 import timer
 import time
diff --git a/scripts/check-repository.py b/scripts/check-repository.py
index 4d3b76004..181b65bb1 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 rpm
+import rpm404 as rpm
 
 FILENAME = 1000000
 
diff --git a/scripts/dumphdrlist.py b/scripts/dumphdrlist.py
index 5e49a8323..6ca2e6a1d 100644
--- a/scripts/dumphdrlist.py
+++ b/scripts/dumphdrlist.py
@@ -21,7 +21,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-import rpm
+import rpm404 as rpm
 import os
 import sys
 
diff --git a/scripts/pkgorder b/scripts/pkgorder
index 2decc375c..9c6f43608 100755
--- a/scripts/pkgorder
+++ b/scripts/pkgorder
@@ -3,7 +3,7 @@
 import sys
 import os
 import os.path
-import rpm
+import rpm404 as rpm
 import string
 
 # set up rpm dependency whiteouts
diff --git a/textw/packages_text.py b/textw/packages_text.py
index a40b847f2..4ab1766fe 100644
--- a/textw/packages_text.py
+++ b/textw/packages_text.py
@@ -11,7 +11,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-import rpm
+import rpm404 as rpm
 from snack import *
 from constants_text import *
 from rhpl.translate import _
diff --git a/textw/progress_text.py b/textw/progress_text.py
index 3a998096d..dbad2a324 100644
--- a/textw/progress_text.py
+++ b/textw/progress_text.py
@@ -11,7 +11,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-import rpm
+import rpm404 as rpm
 from constants import *
 from snack import *
 from constants_text import *
diff --git a/upgrade.py b/upgrade.py
index 698f0862d..d3320940e 100644
--- a/upgrade.py
+++ b/upgrade.py
@@ -17,7 +17,7 @@ import isys
 import os
 import iutil
 import time
-import rpm
+import rpm404 as rpm
 import sys
 import os.path
 import partedUtils
diff --git a/urlinstall.py b/urlinstall.py
index 2eedfa398..7829e9914 100644
--- a/urlinstall.py
+++ b/urlinstall.py
@@ -16,7 +16,7 @@
 from comps import ComponentSet, HeaderList
 from installmethod import InstallMethod
 import os
-import rpm
+import rpm404 as rpm
 import time
 import urllib
 import string
diff --git a/whiteout.py b/whiteout.py
index 7b6cefaad..d416abf4d 100644
--- a/whiteout.py
+++ b/whiteout.py
@@ -4,7 +4,7 @@
 # Copyright 2002  Red Hat, Inc.
 #
 
-import rpm
+import rpm404 as rpm
 
 whiteout="""
 	pango-gtkbeta-devel>pango-gtkbeta\