From e3dbccabab8e90bf5f5a48dbdfcd2d05ed873ad8 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sat, 10 Jan 2009 20:57:44 -0600 Subject: [PATCH] Remove references to generic_stage_target --- ChangeLog | 11 +++++++++++ catalyst | 2 +- modules/catalyst/target/embedded.py | 2 +- modules/catalyst/target/generic_stage.py | 2 +- modules/catalyst/target/grp.py | 2 +- modules/catalyst/target/livecd_stage1.py | 2 +- modules/catalyst/target/livecd_stage2.py | 2 +- modules/catalyst/target/netboot.py | 2 +- modules/catalyst/target/netboot2.py | 2 +- modules/catalyst/target/snapshot.py | 2 +- modules/catalyst/target/stage1.py | 2 +- modules/catalyst/target/stage2.py | 2 +- modules/catalyst/target/stage3.py | 2 +- modules/catalyst/target/stage4.py | 2 +- modules/catalyst/target/tinderbox.py | 2 +- 15 files changed, 25 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3af0270d..8569c7d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,17 @@ # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS) # Distributed under the GPL v2 + 11 Jan 2009; Andrew Gaffney catalyst, + modules/catalyst/target/embedded.py, + 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/netboot2.py, + modules/catalyst/target/snapshot.py, modules/catalyst/target/stage1.py, + modules/catalyst/target/stage2.py, modules/catalyst/target/stage3.py, + modules/catalyst/target/stage4.py, modules/catalyst/target/tinderbox.py: + Remove references to generic_stage_target + 11 Jan 2009; Andrew Gaffney +modules/catalyst/target/embedded.py, -modules/catalyst/target/embedded_target.py, diff --git a/catalyst b/catalyst index e050987e..29e00f69 100755 --- a/catalyst +++ b/catalyst @@ -285,7 +285,7 @@ if __name__ == "__main__": # import configuration file and import our main module using those settings parse_config(myconfig) - from catalyst_support import * + from catalyst.support import * # Start checking that digests are valid now that the hash_map was imported from catalyst_support if conf_values.has_key("digests"): diff --git a/modules/catalyst/target/embedded.py b/modules/catalyst/target/embedded.py index 588e1b74..c0d3464e 100644 --- a/modules/catalyst/target/embedded.py +++ b/modules/catalyst/target/embedded.py @@ -11,7 +11,7 @@ ROOT=/tmp/submerge emerge --blahblah foo bar import os,string,imp,types,shutil from catalyst.support import * -from generic_stage_target import * +from generic_stage import * from stat import * class embedded_target(generic_stage_target): diff --git a/modules/catalyst/target/generic_stage.py b/modules/catalyst/target/generic_stage.py index edf1c7e6..1a8cdbf3 100644 --- a/modules/catalyst/target/generic_stage.py +++ b/modules/catalyst/target/generic_stage.py @@ -6,7 +6,7 @@ the driver class for pretty much everything that Catalyst does. import os,string,imp,types,shutil from catalyst.support import * -from generic_target import * +from catalyst.target.generic import * from stat import * import catalyst.lock import catalyst.arch diff --git a/modules/catalyst/target/grp.py b/modules/catalyst/target/grp.py index 6ccb7823..a805bf3a 100644 --- a/modules/catalyst/target/grp.py +++ b/modules/catalyst/target/grp.py @@ -5,7 +5,7 @@ The builder class for GRP (Gentoo Reference Platform) builds. import os,types,glob from catalyst.support import * -from generic_stage_target import * +from generic_stage import * 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 05e4580e..eef4896b 100644 --- a/modules/catalyst/target/livecd_stage1.py +++ b/modules/catalyst/target/livecd_stage1.py @@ -4,7 +4,7 @@ Builder class for LiveCD stage1. """ from catalyst.support import * -from generic_stage_target import * +from generic_stage import * 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 a8cd73df..ea5d9ecc 100644 --- a/modules/catalyst/target/livecd_stage2.py +++ b/modules/catalyst/target/livecd_stage2.py @@ -5,7 +5,7 @@ Builder class for a LiveCD stage2 build. import os,string,types,stat,shutil from catalyst.support import * -from generic_stage_target import * +from generic_stage import * 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 2f2591a6..675ee901 100644 --- a/modules/catalyst/target/netboot.py +++ b/modules/catalyst/target/netboot.py @@ -5,7 +5,7 @@ Builder class for a netboot build. import os,string,types from catalyst.support import * -from generic_stage_target import * +from generic_stage import * class netboot_target(generic_stage_target): def __init__(self,spec,addlargs): diff --git a/modules/catalyst/target/netboot2.py b/modules/catalyst/target/netboot2.py index c576ad3b..cfb08d37 100644 --- a/modules/catalyst/target/netboot2.py +++ b/modules/catalyst/target/netboot2.py @@ -5,7 +5,7 @@ Builder class for a netboot build, version 2 import os,string,types from catalyst.support import * -from generic_stage_target import * +from generic_stage import * class netboot2_target(generic_stage_target): def __init__(self,spec,addlargs): diff --git a/modules/catalyst/target/snapshot.py b/modules/catalyst/target/snapshot.py index eff2f41f..8f7a7bcb 100644 --- a/modules/catalyst/target/snapshot.py +++ b/modules/catalyst/target/snapshot.py @@ -5,7 +5,7 @@ Builder class for snapshots. import os from catalyst.support import * -from generic_stage_target import * +from generic_stage import * class snapshot_target(generic_stage_target): def __init__(self,myspec,addlargs): diff --git a/modules/catalyst/target/stage1.py b/modules/catalyst/target/stage1.py index fc70dbc5..3bcfe803 100644 --- a/modules/catalyst/target/stage1.py +++ b/modules/catalyst/target/stage1.py @@ -4,7 +4,7 @@ Builder class for a stage1 installation tarball build. """ from catalyst.support import * -from generic_stage_target import * +from generic_stage import * class stage1_target(generic_stage_target): def __init__(self,spec,addlargs): diff --git a/modules/catalyst/target/stage2.py b/modules/catalyst/target/stage2.py index 69daec96..fdaacb99 100644 --- a/modules/catalyst/target/stage2.py +++ b/modules/catalyst/target/stage2.py @@ -4,7 +4,7 @@ Builder class for a stage2 installation tarball build. """ from catalyst.support import * -from generic_stage_target import * +from generic_stage import * class stage2_target(generic_stage_target): def __init__(self,spec,addlargs): diff --git a/modules/catalyst/target/stage3.py b/modules/catalyst/target/stage3.py index 07bd4aa8..2c9ad1ba 100644 --- a/modules/catalyst/target/stage3.py +++ b/modules/catalyst/target/stage3.py @@ -4,7 +4,7 @@ Builder class for a stage3 installation tarball build. """ from catalyst.support import * -from generic_stage_target import * +from generic_stage import * class stage3_target(generic_stage_target): def __init__(self,spec,addlargs): diff --git a/modules/catalyst/target/stage4.py b/modules/catalyst/target/stage4.py index c8c758d9..08c4105a 100644 --- a/modules/catalyst/target/stage4.py +++ b/modules/catalyst/target/stage4.py @@ -4,7 +4,7 @@ Builder class for stage4. """ from catalyst.support import * -from generic_stage_target import * +from generic_stage import * class stage4_target(generic_stage_target): def __init__(self,spec,addlargs): diff --git a/modules/catalyst/target/tinderbox.py b/modules/catalyst/target/tinderbox.py index 8f14b5e3..40cb3207 100644 --- a/modules/catalyst/target/tinderbox.py +++ b/modules/catalyst/target/tinderbox.py @@ -4,7 +4,7 @@ builder class for the tinderbox target """ from catalyst.support import * -from generic_stage_target import * +from generic_stage import * class tinderbox_target(generic_stage_target): def __init__(self,spec,addlargs): -- 2.26.2