--- command-stubs/loadkeys-stub | 8 +------- command-stubs/losetup-stub | 8 +------- command-stubs/mknod-stub | 8 ++------ command-stubs/raidstart-stub | 15 +-------------- command-stubs/raidstop-stub | 15 +-------------- 5 files changed, 6 insertions(+), 48 deletions(-) diff --git a/command-stubs/loadkeys-stub b/command-stubs/loadkeys-stub index 1752717..6d72f5a 100755 --- a/command-stubs/loadkeys-stub +++ b/command-stubs/loadkeys-stub @@ -21,13 +21,7 @@ import os import sys -# for testing -if (os.path.exists('isys')): - sys.path.append('isys') - -sys.path.append('/usr/lib/anaconda') - -import isys +from anaconda import isys def usage(): print "usage: %s keymap" %(sys.argv[0],) diff --git a/command-stubs/losetup-stub b/command-stubs/losetup-stub index bf186a1..3728a05 100755 --- a/command-stubs/losetup-stub +++ b/command-stubs/losetup-stub @@ -21,13 +21,7 @@ import os import sys -# for testing -if (os.path.exists('isys')): - sys.path.append('isys') - -sys.path.append('/usr/lib/anaconda') - -import isys +from anaconda import isys from sys import argv def usage(): diff --git a/command-stubs/mknod-stub b/command-stubs/mknod-stub index dd72aeb..c8933ec 100755 --- a/command-stubs/mknod-stub +++ b/command-stubs/mknod-stub @@ -18,12 +18,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -import sys, os -sys.path.append('/usr/lib/anaconda') -import isys -import string -import stat -import os +import stat, string, sys, os +from anaconda import isys def usage(): sys.stderr.write("Usage: %s <path> [b|c] <major> <minor>\n" %(sys.argv[0],)) diff --git a/command-stubs/raidstart-stub b/command-stubs/raidstart-stub index 2a0d8b3..9aadde3 100755 --- a/command-stubs/raidstart-stub +++ b/command-stubs/raidstart-stub @@ -21,20 +21,7 @@ import os import sys -# for testing -if (os.path.exists('rpmmodule')): - sys.path.append('rpmmodule') - sys.path.append('libfdisk') - sys.path.append('balkan') - sys.path.append('gnome-map') - sys.path.append('isys') - -sys.path.append('/usr/lib/anaconda') - -import anaconda_log -import fsset -import raid -import isys +from anaconda import anaconda_log, fsset, raid, isys from sys import argv if len(argv) != 2 or argv[1][:7] != "/dev/md": diff --git a/command-stubs/raidstop-stub b/command-stubs/raidstop-stub index 942c29e..0c49d03 100755 --- a/command-stubs/raidstop-stub +++ b/command-stubs/raidstop-stub @@ -21,20 +21,7 @@ import os import sys -# for testing -if (os.path.exists('rpmmodule')): - sys.path.append('rpmmodule') - sys.path.append('libfdisk') - sys.path.append('balkan') - sys.path.append('gnome-map') - sys.path.append('isys') - -sys.path.append('/usr/lib/anaconda') - -import anaconda_log -import fsset -import raid -import isys +from anaconda import anaconda_log, fsset, raid, isys from sys import argv if len(argv) != 2 or argv[1][:7] != "/dev/md": -- 1.6.5.1 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list