From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-662215-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 8A726138247
for <garchives@archives.gentoo.org>; Wed, 22 Jan 2014 17:10:14 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9D922E0EA6;
Wed, 22 Jan 2014 17:10:06 +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 003BBE0EA3
for <gentoo-commits@lists.gentoo.org>; Wed, 22 Jan 2014 17:10:04 +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 C4DC133FBFE
for <gentoo-commits@lists.gentoo.org>; Wed, 22 Jan 2014 15:52:34 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by spoonbill.gentoo.org (Postfix) with ESMTP id 5BF54187BA
for <gentoo-commits@lists.gentoo.org>; Wed, 22 Jan 2014 15:52:30 +0000 (UTC)
From: "Brian Dolbec" <brian.dolbec@gmail.com>
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" <brian.dolbec@gmail.com>
Message-ID: <1389559701.3c2bafd1554926d52fe49133a13ca9abaff1c643.dol-sen@gentoo>
Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/, catalyst/modules/, catalyst/targets/
X-VCS-Repository: proj/catalyst
X-VCS-Files: catalyst/main.py catalyst/modules/__init__.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/targets/__init__.py catalyst/targets/embedded_target.py catalyst/targets/generic_stage_target.py catalyst/targets/generic_target.py catalyst/targets/grp_target.py catalyst/targets/livecd_stage1_target.py catalyst/targets/livecd_stage2_target.py catalyst/targets/netboot2_target.py catalyst/targets/netboot_target.py catalyst/targets/snapshot_target.py catalyst/targets/stage1_target.py catalyst/targets/stage2_target.py catal
yst/targets/stage3_target.py catalyst/targets/stage4_target.py catalyst/targets/tinderbox_target.py
X-VCS-Directories: catalyst/ catalyst/modules/ catalyst/targets/
X-VCS-Committer: dol-sen
X-VCS-Committer-Name: Brian Dolbec
X-VCS-Revision: 3c2bafd1554926d52fe49133a13ca9abaff1c643
X-VCS-Branch: pending
Date: Wed, 22 Jan 2014 15:52:30 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 4b24c448-37d2-4cbe-bff2-fe5b60d4c6fe
X-Archives-Hash: a3a34bd9312bf9532658172d669c805d
commit: 3c2bafd1554926d52fe49133a13ca9abaff1c643
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 12 07:43:36 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Jan 12 20:48:21 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=3c2bafd1
Rename the modules subpkg to targets, to better reflect 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(-)
diff --git a/catalyst/main.py b/catalyst/main.py
index 8acd280..cb30bd7 100644
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -200,11 +200,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()
@@ -214,7 +214,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