Move catalyst_support, builder, catalyst_lock out of modules, into the catalyst names...

diff --git a/catalyst/arch/alpha.py b/catalyst/arch/alpha.py
index f0fc95a56efcdbc1cb837a3064f71e8786c2c61b..724802030d503a3ab67cc8c7cb82897e58000b76 100644 (file)
--- a/catalyst/arch/alpha.py
+++ b/catalyst/arch/alpha.py
@@ -1,6 +1,8 @@
 
-import builder,os
-from catalyst_support import *
+import os
+
+from catalyst import builder
+from catalyst.support import *
 
 class generic_alpha(builder.generic):
        "abstract base class for all alpha builders"

diff --git a/catalyst/arch/amd64.py b/catalyst/arch/amd64.py
index 262b55a9cfa0fa9199bfaf50a76978597d8c08e8..13e7563228d64b9317476e288475524808866493 100644 (file)
--- a/catalyst/arch/amd64.py
+++ b/catalyst/arch/amd64.py
@@ -1,5 +1,5 @@
 
-import builder
+from catalyst import builder
 
 class generic_amd64(builder.generic):
        "abstract base class for all amd64 builders"

diff --git a/catalyst/arch/arm.py b/catalyst/arch/arm.py
index 2de39429c3f7c840e422da08f04a1c2158b4aab3..8f207ffffc4fc451574f5d6e4b2f2e6ccdeb96f3 100644 (file)
--- a/catalyst/arch/arm.py
+++ b/catalyst/arch/arm.py
@@ -1,6 +1,8 @@
 
-import builder,os
-from catalyst_support import *
+import os
+
+from catalyst import builder
+from catalyst.support import *
 
 class generic_arm(builder.generic):
        "Abstract base class for all arm (little endian) builders"

diff --git a/catalyst/arch/hppa.py b/catalyst/arch/hppa.py
index f804398fd2b7b6c42d7fc65b3358fd9332956feb..3aac9b6ad3c9fa9aa4835ad242780cbd23788373 100644 (file)
--- a/catalyst/arch/hppa.py
+++ b/catalyst/arch/hppa.py
@@ -1,6 +1,8 @@
 
-import builder,os
-from catalyst_support import *
+import os
+
+from catalyst import builder
+from catalyst.support import *
 
 class generic_hppa(builder.generic):
        "Abstract base class for all hppa builders"

diff --git a/catalyst/arch/ia64.py b/catalyst/arch/ia64.py
index 825af7040f0ccee9f0e9cda6008b1f2e065a5c65..4003085391f0968b6993231a17830fd279b218d4 100644 (file)
--- a/catalyst/arch/ia64.py
+++ b/catalyst/arch/ia64.py
@@ -1,6 +1,8 @@
 
-import builder,os
-from catalyst_support import *
+import os
+
+from catalyst import builder
+from catalyst.support import *
 
 class arch_ia64(builder.generic):
        "builder class for ia64"

diff --git a/catalyst/arch/mips.py b/catalyst/arch/mips.py
index b3730fa160c900d0345974a0decc65c62cb368c0..7cce3921b58cfa62759aee52eec059acdeeb689c 100644 (file)
--- a/catalyst/arch/mips.py
+++ b/catalyst/arch/mips.py
@@ -1,6 +1,8 @@
 
-import builder,os
-from catalyst_support import *
+import os
+
+from catalyst import builder
+from catalyst.support import *
 
 class generic_mips(builder.generic):
        "Abstract base class for all mips builders [Big-endian]"

diff --git a/catalyst/arch/powerpc.py b/catalyst/arch/powerpc.py
index e9f611bf708e2d11a7263d03b89dd4a94d87aa30..6cec58077f02d3f31fd1a3f8af11056ce99f360c 100644 (file)
--- a/catalyst/arch/powerpc.py
+++ b/catalyst/arch/powerpc.py
@@ -1,6 +1,8 @@
 
-import os,builder
-from catalyst_support import *
+import os
+
+from catalyst import builder
+from catalyst.support import *
 
 class generic_ppc(builder.generic):
        "abstract base class for all 32-bit powerpc builders"

diff --git a/catalyst/arch/s390.py b/catalyst/arch/s390.py
index bf22f668523405d43398aa0b3af2d547d4d4adc0..c49e0b769d09cb042ed4f68d17adf869f439fe3b 100644 (file)
--- a/catalyst/arch/s390.py
+++ b/catalyst/arch/s390.py
@@ -1,6 +1,8 @@
 
-import builder,os
-from catalyst_support import *
+import os
+
+from catalyst import builder
+from catalyst.support import *
 
 class generic_s390(builder.generic):
        "abstract base class for all s390 builders"

diff --git a/catalyst/arch/sh.py b/catalyst/arch/sh.py
index 2fc9531500329fe23adcaea0d648b60ed93e27e6..1fa1b0b67715635595b1606f40079e27553b0698 100644 (file)
--- a/catalyst/arch/sh.py
+++ b/catalyst/arch/sh.py
@@ -1,6 +1,8 @@
 
-import builder,os
-from catalyst_support import *
+import os
+
+from catalyst import builder
+from catalyst.support import *
 
 class generic_sh(builder.generic):
        "Abstract base class for all sh builders [Little-endian]"

diff --git a/catalyst/arch/sparc.py b/catalyst/arch/sparc.py
index 5eb5344cf03ec9ca83780da543eb0a6a3bcbe364..28895287f72db5249d6d577b5912ec83d2de3aac 100644 (file)
--- a/catalyst/arch/sparc.py
+++ b/catalyst/arch/sparc.py
@@ -1,6 +1,8 @@
 
-import builder,os
-from catalyst_support import *
+import os
+
+from catalyst import builder
+from catalyst.support import *
 
 class generic_sparc(builder.generic):
        "abstract base class for all sparc builders"

diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
index 0391b792b8dc4e24982d5282fe2a99e2190fe832..c8d19118ecc7cbfd7d5e8b72d5447152fb7c2ebe 100644 (file)
--- a/catalyst/arch/x86.py
+++ b/catalyst/arch/x86.py
@@ -1,6 +1,8 @@
 
-import builder,os
-from catalyst_support import *
+import os
+
+from catalyst import builder
+from catalyst.support import *
 
 class generic_x86(builder.generic):
        "abstract base class for all x86 builders"

diff --git a/catalyst/modules/builder.py b/catalyst/builder.py
similarity index 100%
rename from catalyst/modules/builder.py
rename to catalyst/builder.py

diff --git a/catalyst/config.py b/catalyst/config.py
index 726bf7472c6427f09f625358ea9f93b9081c0d13..460bbd515052a1fd0011e4698c1ab11b09418216 100644 (file)
--- a/catalyst/config.py
+++ b/catalyst/config.py
@@ -1,5 +1,6 @@
+
 import re
-from modules.catalyst_support import *
+from catalyst.support import *
 
 class ParserBase:
 

diff --git a/catalyst/modules/catalyst_lock.py b/catalyst/lock.py
similarity index 99%
rename from catalyst/modules/catalyst_lock.py
rename to catalyst/lock.py
index 5311cf844a295f5d61946441b8e87a4b49ba28e6..2d10d2fa4f8c1ce0c67b28dd6396b19699d9a621 100644 (file)
--- a/catalyst/modules/catalyst_lock.py
+++ b/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/catalyst/main.py b/catalyst/main.py
index f6a3e5116bff6c7d26dbb988dc5f5d91e2c8e59b..8acd2804f9dd57952d0895044c12fbc2df053f4d 100644 (file)
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -20,7 +20,7 @@ sys.path.append(__selfpath__ + "/modules")
 
 import catalyst.config
 import catalyst.util
-from catalyst.modules.catalyst_support import (required_build_targets,
+from catalyst.support import (required_build_targets,
        valid_build_targets, CatalystError, hash_map, find_binary, LockInUse)
 
 __maintainer__="Catalyst <catalyst@gentoo.org>"
@@ -195,7 +195,8 @@ def parse_config(myconfig):
                conf_values["port_logdir"]=myconf["port_logdir"];
 
 def import_modules():
-       # import catalyst's own modules (i.e. catalyst_support and the arch modules)
+       # import catalyst's own modules
+       # (i.e. stage and the arch modules)
        targetmap={}
 
        try:
@@ -346,7 +347,7 @@ def main():
        parse_config(myconfig)
 
        # Start checking that digests are valid now that the hash_map was imported
-       # from catalyst_support
+       # from catalyst.support
        if "digests" in conf_values:
                for i in conf_values["digests"].split():
                        if i not in hash_map:

diff --git a/catalyst/modules/embedded_target.py b/catalyst/modules/embedded_target.py
index f38ea00dd531f567dfe2e293fddf8253fe074d8c..7cee7a66aa93cf13ec466b8e7390351fd93eb852 100644 (file)
--- a/catalyst/modules/embedded_target.py
+++ b/catalyst/modules/embedded_target.py
@@ -11,7 +11,7 @@ ROOT=/tmp/submerge emerge --something foo bar .
 # NOTE: That^^ docstring has influence catalyst-spec(5) man page generation.
 
 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/catalyst/modules/generic_stage_target.py b/catalyst/modules/generic_stage_target.py
index f04b186d8a4302a2576ae228a0f018554a038e88..2b3d7ce85205366063db9120dc555829e7468739 100644 (file)
--- a/catalyst/modules/generic_stage_target.py
+++ b/catalyst/modules/generic_stage_target.py
@@ -1,8 +1,8 @@
 import os,string,imp,types,shutil
-from catalyst_support import *
+from catalyst.support import *
 from generic_target import *
 from stat import *
-import catalyst_lock
+from catalyst.lock import LockDir
 
 
 PORT_LOGDIR_CLEAN = \
@@ -471,7 +471,7 @@ class generic_stage_target(generic_target):
                                normpath(self.settings["snapshot_cache"] + "/" +
                                        self.settings["snapshot"])
                        self.snapcache_lock=\
-                               catalyst_lock.LockDir(self.settings["snapshot_cache_path"])
+                               LockDir(self.settings["snapshot_cache_path"])
                        print "Caching snapshot to "+self.settings["snapshot_cache_path"]
 
        def set_chroot_path(self):
@@ -481,7 +481,7 @@ class generic_stage_target(generic_target):
                """
                self.settings["chroot_path"]=normpath(self.settings["storedir"]+\
                        "/tmp/"+self.settings["target_subpath"])
-               self.chroot_lock=catalyst_lock.LockDir(self.settings["chroot_path"])
+               self.chroot_lock=LockDir(self.settings["chroot_path"])
 
        def set_autoresume_path(self):
                self.settings["autoresume_path"]=normpath(self.settings["storedir"]+\

diff --git a/catalyst/modules/generic_target.py b/catalyst/modules/generic_target.py
index fe96bd73f8c95cccf1ed47bae1f40150fe1ecdf5..de519942063da6fb479f66bdf145c4cb6ec84b77 100644 (file)
--- a/catalyst/modules/generic_target.py
+++ b/catalyst/modules/generic_target.py
@@ -1,4 +1,4 @@
-from catalyst_support import *
+from catalyst.support import *
 
 class generic_target:
        """

diff --git a/catalyst/modules/grp_target.py b/catalyst/modules/grp_target.py
index 6941522224bc65e4e5c8b5824280320090e8a318..8e700429ac06838252bffe30ef900e4325b1fefe 100644 (file)
--- a/catalyst/modules/grp_target.py
+++ b/catalyst/modules/grp_target.py
@@ -4,7 +4,7 @@ Gentoo Reference Platform (GRP) target
 # NOTE: That^^ docstring has influence catalyst-spec(5) man page generation.
 
 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/catalyst/modules/livecd_stage1_target.py b/catalyst/modules/livecd_stage1_target.py
index 59de9bb84ed79d9757f2307d41bad454d718e975..ac846ecbb73aaffeae9f5b3549c055aeb8e84b69 100644 (file)
--- a/catalyst/modules/livecd_stage1_target.py
+++ b/catalyst/modules/livecd_stage1_target.py
@@ -3,7 +3,7 @@ LiveCD stage1 target
 """
 # NOTE: That^^ docstring has influence catalyst-spec(5) man page generation.
 
-from catalyst_support import *
+from catalyst.support import *
 from generic_stage_target import *
 
 class livecd_stage1_target(generic_stage_target):

diff --git a/catalyst/modules/livecd_stage2_target.py b/catalyst/modules/livecd_stage2_target.py
index 5be8fd23870d7955eee29230de511ddd8ea5b84f..1bfd8201a40a40f6e659c286817e2743ca253f2a 100644 (file)
--- a/catalyst/modules/livecd_stage2_target.py
+++ b/catalyst/modules/livecd_stage2_target.py
@@ -4,7 +4,7 @@ LiveCD stage2 target, builds upon previous LiveCD stage1 tarball
 # NOTE: That^^ docstring has influence catalyst-spec(5) man page generation.
 
 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/catalyst/modules/netboot2_target.py b/catalyst/modules/netboot2_target.py
index 1ab7e7da5980f2ce3c90b2077c0e5e8166717667..2b3cd208dfa98e8f26b21c3b133a9aa969aa16db 100644 (file)
--- a/catalyst/modules/netboot2_target.py
+++ b/catalyst/modules/netboot2_target.py
@@ -4,7 +4,7 @@ netboot target, version 2
 # NOTE: That^^ docstring has influence catalyst-spec(5) man page generation.
 
 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/catalyst/modules/netboot_target.py b/catalyst/modules/netboot_target.py
index ff2c81fb88f039356363cd43812d28eab1fe975a..9d01b7e2e21bb4287b81eecbc7b245609528b6be 100644 (file)
--- a/catalyst/modules/netboot_target.py
+++ b/catalyst/modules/netboot_target.py
@@ -4,7 +4,7 @@ netboot target, version 1
 # NOTE: That^^ docstring has influence catalyst-spec(5) man page generation.
 
 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/catalyst/modules/snapshot_target.py b/catalyst/modules/snapshot_target.py
index ba1bab5528e41fab33dbb390a421305fbd35f267..d1b9e40c2d90b6a33b42a4f380800d3793c627e2 100644 (file)
--- a/catalyst/modules/snapshot_target.py
+++ b/catalyst/modules/snapshot_target.py
@@ -3,7 +3,7 @@ Snapshot target
 """
 
 import os
-from catalyst_support import *
+from catalyst.support import *
 from generic_stage_target import *
 
 class snapshot_target(generic_stage_target):

diff --git a/catalyst/modules/stage1_target.py b/catalyst/modules/stage1_target.py
index 5f4ffa0e3b816de223c5fe08b7d7ad1110cc40bf..8d5a6745eac14f7e572c4a35a7135e7d6295d3cd 100644 (file)
--- a/catalyst/modules/stage1_target.py
+++ b/catalyst/modules/stage1_target.py
@@ -3,7 +3,7 @@ stage1 target
 """
 # NOTE: That^^ docstring has influence catalyst-spec(5) man page generation.
 
-from catalyst_support import *
+from catalyst.support import *
 from generic_stage_target import *
 
 class stage1_target(generic_stage_target):

diff --git a/catalyst/modules/stage2_target.py b/catalyst/modules/stage2_target.py
index 6083e2bb84375e376aa2de9da926a3966c265ab1..15acdeec3cb42c0d1f6859c306f58522dd873b10 100644 (file)
--- a/catalyst/modules/stage2_target.py
+++ b/catalyst/modules/stage2_target.py
@@ -3,7 +3,7 @@ stage2 target, builds upon previous stage1 tarball
 """
 # NOTE: That^^ docstring has influence catalyst-spec(5) man page generation.
 
-from catalyst_support import *
+from catalyst.support import *
 from generic_stage_target import *
 
 class stage2_target(generic_stage_target):

diff --git a/catalyst/modules/stage3_target.py b/catalyst/modules/stage3_target.py
index 4d3a008c87996916b75049020e5cafef2a13d8da..89edd6613b932c396d8cbc2751e5b93eb5261f70 100644 (file)
--- a/catalyst/modules/stage3_target.py
+++ b/catalyst/modules/stage3_target.py
@@ -3,7 +3,7 @@ stage3 target, builds upon previous stage2/stage3 tarball
 """
 # NOTE: That^^ docstring has influence catalyst-spec(5) man page generation.
 
-from catalyst_support import *
+from catalyst.support import *
 from generic_stage_target import *
 
 class stage3_target(generic_stage_target):

diff --git a/catalyst/modules/stage4_target.py b/catalyst/modules/stage4_target.py
index ce41b2dacb5c15ecc6b0c995c4915f517745a161..9168f2ee9e695594fccc560b42c61239942dbe70 100644 (file)
--- a/catalyst/modules/stage4_target.py
+++ b/catalyst/modules/stage4_target.py
@@ -3,7 +3,7 @@ stage4 target, builds upon previous stage3/stage4 tarball
 """
 # NOTE: That^^ docstring has influence catalyst-spec(5) man page generation.
 
-from catalyst_support import *
+from catalyst.support import *
 from generic_stage_target import *
 
 class stage4_target(generic_stage_target):

diff --git a/catalyst/modules/tinderbox_target.py b/catalyst/modules/tinderbox_target.py
index ca556108ed1d252d751c97136f2e31bc834856fb..1d3198950bee231ca1cfb16ab698c84f4ab35a06 100644 (file)
--- a/catalyst/modules/tinderbox_target.py
+++ b/catalyst/modules/tinderbox_target.py
@@ -3,7 +3,7 @@ Tinderbox target
 """
 # NOTE: That^^ docstring has influence catalyst-spec(5) man page generation.
 
-from catalyst_support import *
+from catalyst.support import *
 from generic_stage_target import *
 
 class tinderbox_target(generic_stage_target):

diff --git a/catalyst/modules/catalyst_support.py b/catalyst/support.py
similarity index 100%
rename from catalyst/modules/catalyst_support.py
rename to catalyst/support.py