From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D9F79139084 for ; Sun, 2 Mar 2014 15:42:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0F1AE0A45; Sun, 2 Mar 2014 15:42:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CA471E0A45 for ; Sun, 2 Mar 2014 15:42:17 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CAE3833F9E3 for ; Sun, 2 Mar 2014 15:42:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 9ABA5188EA for ; Sun, 2 Mar 2014 15:42:15 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1393093830.030d4bd354a1d630f79224eb875dbbc40fa503d4.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/arch/, catalyst/, catalyst/modules/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/arch/alpha.py catalyst/arch/amd64.py catalyst/arch/arm.py catalyst/arch/hppa.py catalyst/arch/ia64.py catalyst/arch/mips.py catalyst/arch/powerpc.py catalyst/arch/s390.py catalyst/arch/sh.py catalyst/arch/sparc.py catalyst/arch/x86.py catalyst/builder.py catalyst/config.py catalyst/lock.py catalyst/main.py catalyst/modules/builder.py catalyst/modules/catalyst_lock.py catalyst/modules/catalyst_support.py catalyst/modules/embedded_target.py catalyst/modules/generic_stage_target.py catalyst/modules/generic_target.py catalyst/modules/grp_target.py catalyst/modules/livecd_stage1_target.py catalyst/modules/livecd_stage2_target.py catalyst/modules/netboot2_target.py catalyst/modules/netboot_target.py catalyst/modules/snapshot_target.py catalyst/modules/stage1_target.py catalyst/modules/stage2_target.py catalyst/modules/stage3_target.py catalyst/modules/stage4_target.py catalyst/modules/tinderbox_target.py catalyst/support.py X-VCS-Directories: catalyst/arch/ catalyst/ catalyst/modules/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 030d4bd354a1d630f79224eb875dbbc40fa503d4 X-VCS-Branch: master Date: Sun, 2 Mar 2014 15:42:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4da81605-fc6d-4302-9dc4-31ada97c09a6 X-Archives-Hash: 38adda1d56ec4e5463e5b9ccb9986580 commit: 030d4bd354a1d630f79224eb875dbbc40fa503d4 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jan 12 07:32:41 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sat Feb 22 18:30:30 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=030d4bd3 Move catalyst_support, builder, catalyst_lock out of modules, into the catalyst namespace. --- catalyst/arch/alpha.py | 6 ++++-- catalyst/arch/amd64.py | 2 +- catalyst/arch/arm.py | 6 ++++-- catalyst/arch/hppa.py | 6 ++++-- catalyst/arch/ia64.py | 6 ++++-- catalyst/arch/mips.py | 6 ++++-- catalyst/arch/powerpc.py | 6 ++++-- catalyst/arch/s390.py | 6 ++++-- catalyst/arch/sh.py | 6 ++++-- catalyst/arch/sparc.py | 6 ++++-- catalyst/arch/x86.py | 6 ++++-- catalyst/{modules => }/builder.py | 0 catalyst/config.py | 3 ++- catalyst/{modules/catalyst_lock.py => lock.py} | 2 +- catalyst/main.py | 7 ++++--- catalyst/modules/embedded_target.py | 2 +- catalyst/modules/generic_stage_target.py | 8 ++++---- catalyst/modules/generic_target.py | 2 +- catalyst/modules/grp_target.py | 2 +- catalyst/modules/livecd_stage1_target.py | 2 +- catalyst/modules/livecd_stage2_target.py | 2 +- catalyst/modules/netboot2_target.py | 2 +- catalyst/modules/netboot_target.py | 2 +- catalyst/modules/snapshot_target.py | 2 +- catalyst/modules/stage1_target.py | 2 +- catalyst/modules/stage2_target.py | 2 +- catalyst/modules/stage3_target.py | 2 +- catalyst/modules/stage4_target.py | 2 +- catalyst/modules/tinderbox_target.py | 2 +- catalyst/{modules/catalyst_support.py => support.py} | 0 30 files changed, 65 insertions(+), 43 deletions(-) diff --git a/catalyst/arch/alpha.py b/catalyst/arch/alpha.py index f0fc95a..7248020 100644 --- 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 262b55a..13e7563 100644 --- 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 2de3942..8f207ff 100644 --- 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 f804398..3aac9b6 100644 --- 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 825af70..4003085 100644 --- 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 b3730fa..7cce392 100644 --- 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 e9f611b..6cec580 100644 --- 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 bf22f66..c49e0b7 100644 --- 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 2fc9531..1fa1b0b 100644 --- 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 5eb5344..2889528 100644 --- 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 0391b79..c8d1911 100644 --- 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 726bf74..460bbd5 100644 --- 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 5311cf8..2d10d2f 100644 --- 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 f6a3e51..8acd280 100644 --- 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 " @@ -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 f38ea00..7cee7a6 100644 --- 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 f04b186..2b3d7ce 100644 --- 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 fe96bd7..de51994 100644 --- 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 6941522..8e70042 100644 --- 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 59de9bb..ac846ec 100644 --- 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 5be8fd2..1bfd820 100644 --- 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 1ab7e7d..2b3cd20 100644 --- 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 ff2c81f..9d01b7e 100644 --- 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 ba1bab5..d1b9e40 100644 --- 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 5f4ffa0..8d5a674 100644 --- 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 6083e2b..15acdee 100644 --- 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 4d3a008..89edd66 100644 --- 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 ce41b2d..9168f2e 100644 --- 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 ca55610..1d31989 100644 --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C7675138F22 for ; Sat, 22 Feb 2014 18:43:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0ABEE0AD8; Sat, 22 Feb 2014 18:43:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B4BEFE0B20 for ; Sat, 22 Feb 2014 18:43:29 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA50D33FACD for ; Sat, 22 Feb 2014 18:43:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 109D0188EA for ; Sat, 22 Feb 2014 18:43:27 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1393093830.030d4bd354a1d630f79224eb875dbbc40fa503d4.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/arch/, catalyst/, catalyst/modules/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/arch/alpha.py catalyst/arch/amd64.py catalyst/arch/arm.py catalyst/arch/hppa.py catalyst/arch/ia64.py catalyst/arch/mips.py catalyst/arch/powerpc.py catalyst/arch/s390.py catalyst/arch/sh.py catalyst/arch/sparc.py catalyst/arch/x86.py catalyst/builder.py catalyst/config.py catalyst/lock.py catalyst/main.py catalyst/modules/builder.py catalyst/modules/catalyst_lock.py catalyst/modules/catalyst_support.py catalyst/modules/embedded_target.py catalyst/modules/generic_stage_target.py catalyst/modules/generic_target.py catalyst/modules/grp_target.py catalyst/modules/livecd_stage1_target.py catalyst/modules/livecd_stage2_target.py catalyst/modules/netboot2_target.py catalyst/modules/netboot_target.py catalyst/modules/snapshot_target.py catalyst/modules/stage1_target.py catalyst/modules/stage2_target.py catalyst/modules/stage3_target.py catalyst/modules/stage4_target.py catalyst/modules/tinderbox_target.py catalyst/support.py X-VCS-Directories: catalyst/arch/ catalyst/ catalyst/modules/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 030d4bd354a1d630f79224eb875dbbc40fa503d4 X-VCS-Branch: pending Date: Sat, 22 Feb 2014 18:43:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1b669e8a-0912-4540-8f91-af68d208f431 X-Archives-Hash: 5fb709c9e0bcd24d5f55bfe9efa776af Message-ID: <20140222184327.Kz0QbcQQSR5ekW3OOPtZNAzTXtxTKtEmbImc2w0lGTE@z> commit: 030d4bd354a1d630f79224eb875dbbc40fa503d4 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jan 12 07:32:41 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sat Feb 22 18:30:30 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=030d4bd3 Move catalyst_support, builder, catalyst_lock out of modules, into the catalyst namespace. --- catalyst/arch/alpha.py | 6 ++++-- catalyst/arch/amd64.py | 2 +- catalyst/arch/arm.py | 6 ++++-- catalyst/arch/hppa.py | 6 ++++-- catalyst/arch/ia64.py | 6 ++++-- catalyst/arch/mips.py | 6 ++++-- catalyst/arch/powerpc.py | 6 ++++-- catalyst/arch/s390.py | 6 ++++-- catalyst/arch/sh.py | 6 ++++-- catalyst/arch/sparc.py | 6 ++++-- catalyst/arch/x86.py | 6 ++++-- catalyst/{modules => }/builder.py | 0 catalyst/config.py | 3 ++- catalyst/{modules/catalyst_lock.py => lock.py} | 2 +- catalyst/main.py | 7 ++++--- catalyst/modules/embedded_target.py | 2 +- catalyst/modules/generic_stage_target.py | 8 ++++---- catalyst/modules/generic_target.py | 2 +- catalyst/modules/grp_target.py | 2 +- catalyst/modules/livecd_stage1_target.py | 2 +- catalyst/modules/livecd_stage2_target.py | 2 +- catalyst/modules/netboot2_target.py | 2 +- catalyst/modules/netboot_target.py | 2 +- catalyst/modules/snapshot_target.py | 2 +- catalyst/modules/stage1_target.py | 2 +- catalyst/modules/stage2_target.py | 2 +- catalyst/modules/stage3_target.py | 2 +- catalyst/modules/stage4_target.py | 2 +- catalyst/modules/tinderbox_target.py | 2 +- catalyst/{modules/catalyst_support.py => support.py} | 0 30 files changed, 65 insertions(+), 43 deletions(-) diff --git a/catalyst/arch/alpha.py b/catalyst/arch/alpha.py index f0fc95a..7248020 100644 --- 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 262b55a..13e7563 100644 --- 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 2de3942..8f207ff 100644 --- 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 f804398..3aac9b6 100644 --- 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 825af70..4003085 100644 --- 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 b3730fa..7cce392 100644 --- 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 e9f611b..6cec580 100644 --- 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 bf22f66..c49e0b7 100644 --- 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 2fc9531..1fa1b0b 100644 --- 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 5eb5344..2889528 100644 --- 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 0391b79..c8d1911 100644 --- 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 726bf74..460bbd5 100644 --- 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 5311cf8..2d10d2f 100644 --- 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 f6a3e51..8acd280 100644 --- 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 " @@ -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 f38ea00..7cee7a6 100644 --- 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 f04b186..2b3d7ce 100644 --- 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 fe96bd7..de51994 100644 --- 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 6941522..8e70042 100644 --- 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 59de9bb..ac846ec 100644 --- 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 5be8fd2..1bfd820 100644 --- 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 1ab7e7d..2b3cd20 100644 --- 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 ff2c81f..9d01b7e 100644 --- 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 ba1bab5..d1b9e40 100644 --- 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 5f4ffa0..8d5a674 100644 --- 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 6083e2b..15acdee 100644 --- 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 4d3a008..89edd66 100644 --- 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 ce41b2d..9168f2e 100644 --- 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 ca55610..1d31989 100644 --- 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