Import only cmd() from catalyst.spawn

diff --git a/ChangeLog b/ChangeLog
index 8a5059661e3844394950e20c1a3c2773d6e9351d..10efa03a06234db90a2f31332c3d9640cf81226b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  12 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
+  modules/catalyst/target/generic_stage.py, modules/catalyst/target/grp.py,
+  modules/catalyst/target/livecd_stage1.py,
+  modules/catalyst/target/livecd_stage2.py,
+  modules/catalyst/target/netboot.py, modules/catalyst/target/snapshot.py,
+  modules/catalyst/target/tinderbox.py:
+  Import only cmd() from catalyst.spawn
+
   12 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
   modules/catalyst/target/generic_stage.py,
   modules/catalyst/target/livecd_stage2.py,

diff --git a/modules/catalyst/target/generic_stage.py b/modules/catalyst/target/generic_stage.py
index 1ad7cdcb3c3affef9be4be77b430a2454d1a5e39..c168c18257f624015464a829e1e2c5b35752f268 100644 (file)
--- a/modules/catalyst/target/generic_stage.py
+++ b/modules/catalyst/target/generic_stage.py
@@ -10,7 +10,7 @@ import catalyst
 from catalyst.target.generic import *
 from catalyst.output import warn
 from catalyst.error import *
-from catalyst.spawn import *
+from catalyst.spawn import cmd
 
 class generic_stage_target(generic_target):
 

diff --git a/modules/catalyst/target/grp.py b/modules/catalyst/target/grp.py
index f702497316327edcaf1ee81ef8db954d9a012524..3fa3da6071a5c9bb70a48cd6a0d0450ce576160e 100644 (file)
--- a/modules/catalyst/target/grp.py
+++ b/modules/catalyst/target/grp.py
@@ -7,7 +7,7 @@ import os,types,glob
 from generic_stage import *
 import catalyst
 from catalyst.error import *
-from catalyst.spawn import *
+from catalyst.spawn import cmd
 
 class grp_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/livecd_stage1.py b/modules/catalyst/target/livecd_stage1.py
index 596460e77676efd55de74d2cc5a93cde94126a3c..0e3acdf90da1170ce72b2bd83342776a7dd5fb46 100644 (file)
--- a/modules/catalyst/target/livecd_stage1.py
+++ b/modules/catalyst/target/livecd_stage1.py
@@ -5,7 +5,7 @@ Builder class for LiveCD stage1.
 
 from generic_stage import *
 import catalyst.util
-from catalyst.spawn import *
+from catalyst.spawn import cmd
 
 class livecd_stage1_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/livecd_stage2.py b/modules/catalyst/target/livecd_stage2.py
index 883e7c8e366e93c99883dffad3bda8456e61c16b..67210db70cc8e13ce1611415293ac6579648bda0 100644 (file)
--- a/modules/catalyst/target/livecd_stage2.py
+++ b/modules/catalyst/target/livecd_stage2.py
@@ -7,7 +7,7 @@ import os
 from generic_stage import *
 import catalyst
 from catalyst.error import *
-from catalyst.spawn import *
+from catalyst.spawn import cmd
 
 class livecd_stage2_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/netboot.py b/modules/catalyst/target/netboot.py
index d6e2ef156ad7be18ba8b55a4f7b948ae5d691fbd..896beefa274ab58e829b034929f073c5241c3c28 100644 (file)
--- a/modules/catalyst/target/netboot.py
+++ b/modules/catalyst/target/netboot.py
@@ -7,7 +7,7 @@ import os,string,types
 from generic_stage import *
 import catalyst.util
 from catalyst.error import *
-from catalyst.spawn import *
+from catalyst.spawn import cmd
 
 class netboot_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/modules/catalyst/target/snapshot.py b/modules/catalyst/target/snapshot.py
index adfbb08c00bcd00e8c771d65e434caadab3f4f7a..1d7d3a0952f595fe0541f2f6fb3be0429dabafb2 100644 (file)
--- a/modules/catalyst/target/snapshot.py
+++ b/modules/catalyst/target/snapshot.py
@@ -6,7 +6,7 @@ Builder class for snapshots.
 import os
 from generic_stage import *
 import catalyst
-from catalyst.spawn import *
+from catalyst.spawn import cmd
 
 class snapshot_target(generic_target):
        def __init__(self,myspec,addlargs):

diff --git a/modules/catalyst/target/tinderbox.py b/modules/catalyst/target/tinderbox.py
index 8e1eaa76a0d1e557ab9c014b6e94ec7af8338520..00f58505a89b5461558491488194b823f77c992c 100644 (file)
--- a/modules/catalyst/target/tinderbox.py
+++ b/modules/catalyst/target/tinderbox.py
@@ -6,7 +6,7 @@ builder class for the tinderbox target
 from generic_stage import *
 import catalyst.util
 from catalyst.error import *
-from catalyst.spawn import *
+from catalyst.spawn import cmd
 
 class tinderbox_target(generic_stage_target):
        def __init__(self,spec,addlargs):