From 0963ddefbd9b8ecf09214f86c66855d8e6c30f6e Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sat, 10 Jan 2009 20:26:07 -0600 Subject: [PATCH] Move catalyst_support.py to catalyst.support and update references --- ChangeLog | 24 +++++++++++++++++++ modules/catalyst/arch/__init__.py | 2 +- modules/catalyst/arch/alpha.py | 2 +- modules/catalyst/arch/arm.py | 2 +- modules/catalyst/arch/hppa.py | 2 +- modules/catalyst/arch/ia64.py | 2 +- modules/catalyst/arch/mips.py | 2 +- modules/catalyst/arch/powerpc.py | 2 +- modules/catalyst/arch/s390.py | 2 +- modules/catalyst/arch/sh.py | 2 +- modules/catalyst/arch/sparc.py | 2 +- modules/catalyst/arch/x86.py | 2 +- modules/catalyst/lock.py | 2 +- .../support.py} | 0 modules/catalyst/target/__init__.py | 2 +- modules/catalyst/target/embedded_target.py | 2 +- .../catalyst/target/generic_stage_target.py | 2 +- modules/catalyst/target/generic_target.py | 2 +- modules/catalyst/target/grp_target.py | 2 +- .../catalyst/target/livecd_stage1_target.py | 2 +- .../catalyst/target/livecd_stage2_target.py | 2 +- modules/catalyst/target/netboot2_target.py | 2 +- modules/catalyst/target/netboot_target.py | 2 +- modules/catalyst/target/snapshot_target.py | 2 +- modules/catalyst/target/stage1_target.py | 2 +- modules/catalyst/target/stage2_target.py | 2 +- modules/catalyst/target/stage3_target.py | 2 +- modules/catalyst/target/stage4_target.py | 2 +- modules/catalyst/target/tinderbox_target.py | 2 +- 29 files changed, 51 insertions(+), 27 deletions(-) rename modules/{catalyst_support.py => catalyst/support.py} (100%) diff --git a/ChangeLog b/ChangeLog index f5b34357..0333cffb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,30 @@ # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS) # Distributed under the GPL v2 + 11 Jan 2009; Andrew Gaffney + modules/catalyst/arch/__init__.py, modules/catalyst/arch/alpha.py, + modules/catalyst/arch/arm.py, modules/catalyst/arch/hppa.py, + modules/catalyst/arch/ia64.py, modules/catalyst/arch/mips.py, + modules/catalyst/arch/powerpc.py, modules/catalyst/arch/s390.py, + modules/catalyst/arch/sh.py, modules/catalyst/arch/sparc.py, + modules/catalyst/arch/x86.py, modules/catalyst/lock.py, + +modules/catalyst/support.py, modules/catalyst/target/__init__.py, + modules/catalyst/target/embedded_target.py, + modules/catalyst/target/generic_stage_target.py, + modules/catalyst/target/generic_target.py, + modules/catalyst/target/grp_target.py, + modules/catalyst/target/livecd_stage1_target.py, + modules/catalyst/target/livecd_stage2_target.py, + modules/catalyst/target/netboot2_target.py, + modules/catalyst/target/netboot_target.py, + modules/catalyst/target/snapshot_target.py, + modules/catalyst/target/stage1_target.py, + modules/catalyst/target/stage2_target.py, + modules/catalyst/target/stage3_target.py, + modules/catalyst/target/stage4_target.py, + modules/catalyst/target/tinderbox_target.py, -modules/catalyst_support.py: + Move catalyst_support.py to catalyst.support and update references + 11 Jan 2009; Andrew Gaffney +modules/catalyst/lock.py, modules/catalyst/target/generic_stage_target.py, diff --git a/modules/catalyst/arch/__init__.py b/modules/catalyst/arch/__init__.py index a46f6d8c..173dddb0 100644 --- a/modules/catalyst/arch/__init__.py +++ b/modules/catalyst/arch/__init__.py @@ -7,7 +7,7 @@ import imp import catalyst.util # This is only until we move all the output stuff into catalyst.output -from catalyst_support import msg +from catalyst.support import msg class arches: diff --git a/modules/catalyst/arch/alpha.py b/modules/catalyst/arch/alpha.py index f5e19ee6..884b9d2e 100644 --- a/modules/catalyst/arch/alpha.py +++ b/modules/catalyst/arch/alpha.py @@ -1,6 +1,6 @@ import builder,os -from catalyst_support import * +from catalyst.support import * class generic_alpha(builder.generic): "abstract base class for all alpha builders" diff --git a/modules/catalyst/arch/arm.py b/modules/catalyst/arch/arm.py index 55c7010e..e90625df 100644 --- a/modules/catalyst/arch/arm.py +++ b/modules/catalyst/arch/arm.py @@ -1,6 +1,6 @@ import builder,os -from catalyst_support import * +from catalyst.support import * class generic_arm(builder.generic): "Abstract base class for all arm (little endian) builders" diff --git a/modules/catalyst/arch/hppa.py b/modules/catalyst/arch/hppa.py index 548a048f..66049994 100644 --- a/modules/catalyst/arch/hppa.py +++ b/modules/catalyst/arch/hppa.py @@ -1,6 +1,6 @@ import builder,os -from catalyst_support import * +from catalyst.support import * class generic_hppa(builder.generic): "Abstract base class for all hppa builders" diff --git a/modules/catalyst/arch/ia64.py b/modules/catalyst/arch/ia64.py index 674d9faa..791c646c 100644 --- a/modules/catalyst/arch/ia64.py +++ b/modules/catalyst/arch/ia64.py @@ -1,6 +1,6 @@ import builder,os -from catalyst_support import * +from catalyst.support import * class arch_ia64(builder.generic): "builder class for ia64" diff --git a/modules/catalyst/arch/mips.py b/modules/catalyst/arch/mips.py index 55638449..649cf74b 100644 --- a/modules/catalyst/arch/mips.py +++ b/modules/catalyst/arch/mips.py @@ -1,6 +1,6 @@ import builder,os -from catalyst_support import * +from catalyst.support import * class generic_mips(builder.generic): "Abstract base class for all mips builders [Big-endian]" diff --git a/modules/catalyst/arch/powerpc.py b/modules/catalyst/arch/powerpc.py index ed0d9f88..bbbcb81c 100644 --- a/modules/catalyst/arch/powerpc.py +++ b/modules/catalyst/arch/powerpc.py @@ -1,6 +1,6 @@ import os,builder -from catalyst_support import * +from catalyst.support import * class generic_ppc(builder.generic): "abstract base class for all 32-bit powerpc builders" diff --git a/modules/catalyst/arch/s390.py b/modules/catalyst/arch/s390.py index f12ee55f..4ccff224 100644 --- a/modules/catalyst/arch/s390.py +++ b/modules/catalyst/arch/s390.py @@ -1,6 +1,6 @@ import builder,os -from catalyst_support import * +from catalyst.support import * class generic_s390(builder.generic): "abstract base class for all s390 builders" diff --git a/modules/catalyst/arch/sh.py b/modules/catalyst/arch/sh.py index d3a682bb..05b2b1fe 100644 --- a/modules/catalyst/arch/sh.py +++ b/modules/catalyst/arch/sh.py @@ -1,6 +1,6 @@ import builder,os -from catalyst_support import * +from catalyst.support import * class generic_sh(builder.generic): "Abstract base class for all sh builders [Little-endian]" diff --git a/modules/catalyst/arch/sparc.py b/modules/catalyst/arch/sparc.py index 2c801efd..9cb93a03 100644 --- a/modules/catalyst/arch/sparc.py +++ b/modules/catalyst/arch/sparc.py @@ -1,6 +1,6 @@ import builder,os -from catalyst_support import * +from catalyst.support import * class generic_sparc(builder.generic): "abstract base class for all sparc builders" diff --git a/modules/catalyst/arch/x86.py b/modules/catalyst/arch/x86.py index 41b873ea..a260074a 100644 --- a/modules/catalyst/arch/x86.py +++ b/modules/catalyst/arch/x86.py @@ -1,6 +1,6 @@ import builder,os -from catalyst_support import * +from catalyst.support import * class generic_x86(builder.generic): "abstract base class for all x86 builders" diff --git a/modules/catalyst/lock.py b/modules/catalyst/lock.py index a3743c91..37208821 100644 --- a/modules/catalyst/lock.py +++ b/modules/catalyst/lock.py @@ -5,7 +5,7 @@ import errno import sys import string import time -from catalyst_support import * +from catalyst.support import * def writemsg(mystr): sys.stderr.write(mystr) diff --git a/modules/catalyst_support.py b/modules/catalyst/support.py similarity index 100% rename from modules/catalyst_support.py rename to modules/catalyst/support.py diff --git a/modules/catalyst/target/__init__.py b/modules/catalyst/target/__init__.py index 8a90e2dd..a482efa7 100644 --- a/modules/catalyst/target/__init__.py +++ b/modules/catalyst/target/__init__.py @@ -7,7 +7,7 @@ import imp import catalyst.util # This is only until we move all the output stuff into catalyst.output -from catalyst_support import msg +from catalyst.support import msg class targets: diff --git a/modules/catalyst/target/embedded_target.py b/modules/catalyst/target/embedded_target.py index f1b244c9..588e1b74 100644 --- a/modules/catalyst/target/embedded_target.py +++ b/modules/catalyst/target/embedded_target.py @@ -10,7 +10,7 @@ ROOT=/tmp/submerge emerge --blahblah foo bar """ import os,string,imp,types,shutil -from catalyst_support import * +from catalyst.support import * from generic_stage_target import * from stat import * diff --git a/modules/catalyst/target/generic_stage_target.py b/modules/catalyst/target/generic_stage_target.py index 4db1d70b..edf1c7e6 100644 --- a/modules/catalyst/target/generic_stage_target.py +++ b/modules/catalyst/target/generic_stage_target.py @@ -5,7 +5,7 @@ the driver class for pretty much everything that Catalyst does. """ import os,string,imp,types,shutil -from catalyst_support import * +from catalyst.support import * from generic_target import * from stat import * import catalyst.lock diff --git a/modules/catalyst/target/generic_target.py b/modules/catalyst/target/generic_target.py index 82a4c56b..7b34c423 100644 --- a/modules/catalyst/target/generic_target.py +++ b/modules/catalyst/target/generic_target.py @@ -3,7 +3,7 @@ The toplevel class for generic_stage_target. This is about as generic as we get. """ -from catalyst_support import * +from catalyst.support import * class generic_target: diff --git a/modules/catalyst/target/grp_target.py b/modules/catalyst/target/grp_target.py index f0806bdb..6ccb7823 100644 --- a/modules/catalyst/target/grp_target.py +++ b/modules/catalyst/target/grp_target.py @@ -4,7 +4,7 @@ The builder class for GRP (Gentoo Reference Platform) builds. """ import os,types,glob -from catalyst_support import * +from catalyst.support import * from generic_stage_target import * class grp_target(generic_stage_target): diff --git a/modules/catalyst/target/livecd_stage1_target.py b/modules/catalyst/target/livecd_stage1_target.py index 9f75cea9..05e4580e 100644 --- a/modules/catalyst/target/livecd_stage1_target.py +++ b/modules/catalyst/target/livecd_stage1_target.py @@ -3,7 +3,7 @@ Builder class for LiveCD stage1. """ -from catalyst_support import * +from catalyst.support import * from generic_stage_target import * class livecd_stage1_target(generic_stage_target): diff --git a/modules/catalyst/target/livecd_stage2_target.py b/modules/catalyst/target/livecd_stage2_target.py index 237108ba..a8cd73df 100644 --- a/modules/catalyst/target/livecd_stage2_target.py +++ b/modules/catalyst/target/livecd_stage2_target.py @@ -4,7 +4,7 @@ Builder class for a LiveCD stage2 build. """ import os,string,types,stat,shutil -from catalyst_support import * +from catalyst.support import * from generic_stage_target import * class livecd_stage2_target(generic_stage_target): diff --git a/modules/catalyst/target/netboot2_target.py b/modules/catalyst/target/netboot2_target.py index fd29e487..c576ad3b 100644 --- a/modules/catalyst/target/netboot2_target.py +++ b/modules/catalyst/target/netboot2_target.py @@ -4,7 +4,7 @@ Builder class for a netboot build, version 2 """ import os,string,types -from catalyst_support import * +from catalyst.support import * from generic_stage_target import * class netboot2_target(generic_stage_target): diff --git a/modules/catalyst/target/netboot_target.py b/modules/catalyst/target/netboot_target.py index b0b55f00..2f2591a6 100644 --- a/modules/catalyst/target/netboot_target.py +++ b/modules/catalyst/target/netboot_target.py @@ -4,7 +4,7 @@ Builder class for a netboot build. """ import os,string,types -from catalyst_support import * +from catalyst.support import * from generic_stage_target import * class netboot_target(generic_stage_target): diff --git a/modules/catalyst/target/snapshot_target.py b/modules/catalyst/target/snapshot_target.py index a8873cfa..eff2f41f 100644 --- a/modules/catalyst/target/snapshot_target.py +++ b/modules/catalyst/target/snapshot_target.py @@ -4,7 +4,7 @@ Builder class for snapshots. """ import os -from catalyst_support import * +from catalyst.support import * from generic_stage_target import * class snapshot_target(generic_stage_target): diff --git a/modules/catalyst/target/stage1_target.py b/modules/catalyst/target/stage1_target.py index aa5360f8..fc70dbc5 100644 --- a/modules/catalyst/target/stage1_target.py +++ b/modules/catalyst/target/stage1_target.py @@ -3,7 +3,7 @@ Builder class for a stage1 installation tarball build. """ -from catalyst_support import * +from catalyst.support import * from generic_stage_target import * class stage1_target(generic_stage_target): diff --git a/modules/catalyst/target/stage2_target.py b/modules/catalyst/target/stage2_target.py index 428d98ef..69daec96 100644 --- a/modules/catalyst/target/stage2_target.py +++ b/modules/catalyst/target/stage2_target.py @@ -3,7 +3,7 @@ Builder class for a stage2 installation tarball build. """ -from catalyst_support import * +from catalyst.support import * from generic_stage_target import * class stage2_target(generic_stage_target): diff --git a/modules/catalyst/target/stage3_target.py b/modules/catalyst/target/stage3_target.py index e7d6632e..07bd4aa8 100644 --- a/modules/catalyst/target/stage3_target.py +++ b/modules/catalyst/target/stage3_target.py @@ -3,7 +3,7 @@ Builder class for a stage3 installation tarball build. """ -from catalyst_support import * +from catalyst.support import * from generic_stage_target import * class stage3_target(generic_stage_target): diff --git a/modules/catalyst/target/stage4_target.py b/modules/catalyst/target/stage4_target.py index 486ad60b..c8c758d9 100644 --- a/modules/catalyst/target/stage4_target.py +++ b/modules/catalyst/target/stage4_target.py @@ -3,7 +3,7 @@ Builder class for stage4. """ -from catalyst_support import * +from catalyst.support import * from generic_stage_target import * class stage4_target(generic_stage_target): diff --git a/modules/catalyst/target/tinderbox_target.py b/modules/catalyst/target/tinderbox_target.py index c4618db6..8f14b5e3 100644 --- a/modules/catalyst/target/tinderbox_target.py +++ b/modules/catalyst/target/tinderbox_target.py @@ -3,7 +3,7 @@ builder class for the tinderbox target """ -from catalyst_support import * +from catalyst.support import * from generic_stage_target import * class tinderbox_target(generic_stage_target): -- 2.26.2