From e12559d02a71b4daae7514494863d0c24a831e2f Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Fri, 11 Jan 2013 23:43:36 -0800 Subject: [PATCH] rename the modules subpkg to targets, it better reflects what it contains --- catalyst/main.py | 6 +++--- catalyst/{modules => targets}/__init__.py | 0 catalyst/{modules => targets}/embedded_target.py | 0 catalyst/{modules => targets}/generic_stage_target.py | 0 catalyst/{modules => targets}/generic_target.py | 0 catalyst/{modules => targets}/grp_target.py | 0 catalyst/{modules => targets}/livecd_stage1_target.py | 0 catalyst/{modules => targets}/livecd_stage2_target.py | 0 catalyst/{modules => targets}/netboot2_target.py | 0 catalyst/{modules => targets}/netboot_target.py | 0 catalyst/{modules => targets}/snapshot_target.py | 0 catalyst/{modules => targets}/stage1_target.py | 0 catalyst/{modules => targets}/stage2_target.py | 0 catalyst/{modules => targets}/stage3_target.py | 0 catalyst/{modules => targets}/stage4_target.py | 0 catalyst/{modules => targets}/tinderbox_target.py | 0 16 files changed, 3 insertions(+), 3 deletions(-) rename catalyst/{modules => targets}/__init__.py (100%) rename catalyst/{modules => targets}/embedded_target.py (100%) rename catalyst/{modules => targets}/generic_stage_target.py (100%) rename catalyst/{modules => targets}/generic_target.py (100%) rename catalyst/{modules => targets}/grp_target.py (100%) rename catalyst/{modules => targets}/livecd_stage1_target.py (100%) rename catalyst/{modules => targets}/livecd_stage2_target.py (100%) rename catalyst/{modules => targets}/netboot2_target.py (100%) rename catalyst/{modules => targets}/netboot_target.py (100%) rename catalyst/{modules => targets}/snapshot_target.py (100%) rename catalyst/{modules => targets}/stage1_target.py (100%) rename catalyst/{modules => targets}/stage2_target.py (100%) rename catalyst/{modules => targets}/stage3_target.py (100%) rename catalyst/{modules => targets}/stage4_target.py (100%) rename catalyst/{modules => targets}/tinderbox_target.py (100%) diff --git a/catalyst/main.py b/catalyst/main.py index 31c1eb6e..5aa04025 100755 --- a/catalyst/main.py +++ b/catalyst/main.py @@ -198,11 +198,11 @@ def import_modules(): targetmap={} try: - module_dir = __selfpath__ + "/modules/" + module_dir = __selfpath__ + "/targets/" for x in required_build_targets: try: fh = open(module_dir + x + ".py") - module = imp.load_module(x, fh, "modules/" + x + ".py", + module = imp.load_module(x, fh, "targets/" + x + ".py", (".py", "r", imp.PY_SOURCE)) fh.close() @@ -212,7 +212,7 @@ def import_modules(): for x in valid_build_targets: try: fh = open(module_dir + x + ".py") - module = imp.load_module(x, fh, "modules/" + x + ".py", + module = imp.load_module(x, fh, "targets/" + x + ".py", (".py", "r", imp.PY_SOURCE)) module.register(targetmap) fh.close() diff --git a/catalyst/modules/__init__.py b/catalyst/targets/__init__.py similarity index 100% rename from catalyst/modules/__init__.py rename to catalyst/targets/__init__.py diff --git a/catalyst/modules/embedded_target.py b/catalyst/targets/embedded_target.py similarity index 100% rename from catalyst/modules/embedded_target.py rename to catalyst/targets/embedded_target.py diff --git a/catalyst/modules/generic_stage_target.py b/catalyst/targets/generic_stage_target.py similarity index 100% rename from catalyst/modules/generic_stage_target.py rename to catalyst/targets/generic_stage_target.py diff --git a/catalyst/modules/generic_target.py b/catalyst/targets/generic_target.py similarity index 100% rename from catalyst/modules/generic_target.py rename to catalyst/targets/generic_target.py diff --git a/catalyst/modules/grp_target.py b/catalyst/targets/grp_target.py similarity index 100% rename from catalyst/modules/grp_target.py rename to catalyst/targets/grp_target.py diff --git a/catalyst/modules/livecd_stage1_target.py b/catalyst/targets/livecd_stage1_target.py similarity index 100% rename from catalyst/modules/livecd_stage1_target.py rename to catalyst/targets/livecd_stage1_target.py diff --git a/catalyst/modules/livecd_stage2_target.py b/catalyst/targets/livecd_stage2_target.py similarity index 100% rename from catalyst/modules/livecd_stage2_target.py rename to catalyst/targets/livecd_stage2_target.py diff --git a/catalyst/modules/netboot2_target.py b/catalyst/targets/netboot2_target.py similarity index 100% rename from catalyst/modules/netboot2_target.py rename to catalyst/targets/netboot2_target.py diff --git a/catalyst/modules/netboot_target.py b/catalyst/targets/netboot_target.py similarity index 100% rename from catalyst/modules/netboot_target.py rename to catalyst/targets/netboot_target.py diff --git a/catalyst/modules/snapshot_target.py b/catalyst/targets/snapshot_target.py similarity index 100% rename from catalyst/modules/snapshot_target.py rename to catalyst/targets/snapshot_target.py diff --git a/catalyst/modules/stage1_target.py b/catalyst/targets/stage1_target.py similarity index 100% rename from catalyst/modules/stage1_target.py rename to catalyst/targets/stage1_target.py diff --git a/catalyst/modules/stage2_target.py b/catalyst/targets/stage2_target.py similarity index 100% rename from catalyst/modules/stage2_target.py rename to catalyst/targets/stage2_target.py diff --git a/catalyst/modules/stage3_target.py b/catalyst/targets/stage3_target.py similarity index 100% rename from catalyst/modules/stage3_target.py rename to catalyst/targets/stage3_target.py diff --git a/catalyst/modules/stage4_target.py b/catalyst/targets/stage4_target.py similarity index 100% rename from catalyst/modules/stage4_target.py rename to catalyst/targets/stage4_target.py diff --git a/catalyst/modules/tinderbox_target.py b/catalyst/targets/tinderbox_target.py similarity index 100% rename from catalyst/modules/tinderbox_target.py rename to catalyst/targets/tinderbox_target.py -- 2.26.2