Put the vim modeline in all source files to avoid any more tab/space mess.

diff --git a/modules/catalyst/__init__.py b/modules/catalyst/__init__.py
index a7d2aaff40926dba8da6535d819649d7f8575b11..66b15669fd03812f457aca88fa8f0b2167d23f04 100644 (file)
--- a/modules/catalyst/__init__.py
+++ b/modules/catalyst/__init__.py
@@ -15,3 +15,5 @@ error = catalyst.error
 spawn = catalyst.spawn
 target = catalyst.target
 config = catalyst.config
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/arch/__init__.py b/modules/catalyst/arch/__init__.py
index 99628edabdc444fcbd97c0f2ba7ab6f6f0a41475..f5010f117f164efaa9f5d816703def5fd478cb8c 100644 (file)
--- a/modules/catalyst/arch/__init__.py
+++ b/modules/catalyst/arch/__init__.py
@@ -26,3 +26,5 @@ class generic_arch:
 
        def __init__(self, myspec):
                self.settings = myspec
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/arch/alpha.py b/modules/catalyst/arch/alpha.py
index 71e3e652b500baf0dfb3b532b1f4e85c755a3253..8f6606f68c05c6f92c31e56bbbbc228314fdfff8 100644 (file)
--- a/modules/catalyst/arch/alpha.py
+++ b/modules/catalyst/arch/alpha.py
@@ -78,3 +78,5 @@ _subarch_map = {
 }
 
 _machine_map = ("alpha", )
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/arch/amd64.py b/modules/catalyst/arch/amd64.py
index ce70ccb5d42ebc9e5363d333fb26819daf19c2dc..c6e0018214cc0607f2d8b0cea8f5ed23e63c6684 100644 (file)
--- a/modules/catalyst/arch/amd64.py
+++ b/modules/catalyst/arch/amd64.py
@@ -72,3 +72,4 @@ _subarch_map = {
 
 _machine_map = ("x86_64","amd64","nocona")
 
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/arch/arm.py b/modules/catalyst/arch/arm.py
index 239cf5760fea7ed157b87fc0af8d9da5a56cb048..65b8e46aab0dbfa78896c94a55a7d545bf10a6e4 100644 (file)
--- a/modules/catalyst/arch/arm.py
+++ b/modules/catalyst/arch/arm.py
@@ -162,3 +162,5 @@ _subarch_map = {
 }
 
 _machine_map = ("arm", "armv4l", "armv4tl", "armv5l", "armv5tl", "armv5tel", "armv5tejl", "armv6l", "armv7l", "armeb", "armv5teb")
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/arch/hppa.py b/modules/catalyst/arch/hppa.py
index 3c75c3881863231c40b63cfd4f93daa3e0e280b0..b20b48a824028ce1503a477bcaa4903f12f80c76 100644 (file)
--- a/modules/catalyst/arch/hppa.py
+++ b/modules/catalyst/arch/hppa.py
@@ -38,3 +38,4 @@ _subarch_map = {
 
 _machine_map = ("parisc","parisc64","hppa","hppa64")
 
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/arch/ia64.py b/modules/catalyst/arch/ia64.py
index be7f636e9449de851962e7f772bc2342f4e0a142..6a54b3d981f9fbfe15c20f5d3bf757ae768e9325 100644 (file)
--- a/modules/catalyst/arch/ia64.py
+++ b/modules/catalyst/arch/ia64.py
@@ -16,3 +16,4 @@ _subarch_map = {
 
 _machine_map = ("ia64", )
 
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/arch/mips.py b/modules/catalyst/arch/mips.py
index 6d3b22dfc0d53adee2fe3b0659bbe2b744e4917e..7234b65afc91f64232eafae8a91d53c301af648d 100644 (file)
--- a/modules/catalyst/arch/mips.py
+++ b/modules/catalyst/arch/mips.py
@@ -191,3 +191,4 @@ _subarch_map = {
 
 _machine_map = ("mips","mips64")
 
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/arch/powerpc.py b/modules/catalyst/arch/powerpc.py
index d75e23d540f85f8efbdd8cb4f5cdd171a07473bb..53969e906fc4711ab155e9d7f8823df6133a8045 100644 (file)
--- a/modules/catalyst/arch/powerpc.py
+++ b/modules/catalyst/arch/powerpc.py
@@ -123,3 +123,4 @@ _subarch_map = {
 
 _machine_map = ("ppc","ppc64","powerpc","powerpc64")
 
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/arch/s390.py b/modules/catalyst/arch/s390.py
index 107a7e91cf91713c15e7a8aa17a520910f3e2f21..3e51feae5e52dc2904e98079dc5de3ec5c226b12 100644 (file)
--- a/modules/catalyst/arch/s390.py
+++ b/modules/catalyst/arch/s390.py
@@ -34,3 +34,4 @@ _subarch_map = {
 
 _machine_map = ("s390", "s390x")
 
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/arch/sh.py b/modules/catalyst/arch/sh.py
index fe169d619225742042c05642143a2d83fe1422f2..319ced2fea48279717a5d7c102a31d59a277a2ca 100644 (file)
--- a/modules/catalyst/arch/sh.py
+++ b/modules/catalyst/arch/sh.py
@@ -113,3 +113,4 @@ _subarch_map = {
 
 _machine_map = ("sh2","sh2a","sh3","sh4","sh4a","sh2eb","sh2aeb","sh3eb","sh4eb","sh4aeb")
 
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/arch/sparc.py b/modules/catalyst/arch/sparc.py
index 14ee1e0f4b0a4338d2baef3e54dd20bef850d501..0e3519a9411bcccb505f4f4bcffd693f5ed56376 100644 (file)
--- a/modules/catalyst/arch/sparc.py
+++ b/modules/catalyst/arch/sparc.py
@@ -41,3 +41,4 @@ _subarch_map = {
 
 _machine_map = ("sparc","sparc64")
 
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/arch/x86.py b/modules/catalyst/arch/x86.py
index f4e76a0bbd1b16ac008a781f1fc2be3ceef1a681..8b1cfd162cbfd40d84df82c02034d1587094664d 100644 (file)
--- a/modules/catalyst/arch/x86.py
+++ b/modules/catalyst/arch/x86.py
@@ -151,3 +151,4 @@ _subarch_map = {
 
 _machine_map = ('i386', 'i486', 'i586', 'i686')
 
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/config.py b/modules/catalyst/config.py
index b6f0a7fba147969c2a1a583974683cafb4af1532..fc36ce272500445ef7941a6a9d8588537f03537d 100644 (file)
--- a/modules/catalyst/config.py
+++ b/modules/catalyst/config.py
@@ -239,3 +239,5 @@ class config:
 
        def get_targetmap(self):
                return self.targetmap
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/error.py b/modules/catalyst/error.py
index ef028615ff317ea61e1275db883cd2c6fea5d6dd..381048a8093a84349f802c1c7a8b915e30693891 100644 (file)
--- a/modules/catalyst/error.py
+++ b/modules/catalyst/error.py
@@ -27,3 +27,4 @@ class LockInUse(Exception):
                        warn("lock file in use: " + message)
                        msg()
 
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/hash.py b/modules/catalyst/hash.py
index 43ee89ed7d1154983c19d370c8754475017717fa..b30a644aa0880d01fadb210808d49cb18a2936db 100644 (file)
--- a/modules/catalyst/hash.py
+++ b/modules/catalyst/hash.py
@@ -160,3 +160,4 @@ hash_map={
         "whirlpool":[calc_hash2,"shash","-a WHIRLPOOL","WHIRLPOOL"],
 }
 
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/lock.py b/modules/catalyst/lock.py
index 8e79ac874de67737323c20a67d145199574084c5..63206a6fe7bd4c539ccc5c15865ffbbd6ba0bba5 100644 (file)
--- a/modules/catalyst/lock.py
+++ b/modules/catalyst/lock.py
@@ -466,3 +466,5 @@ if __name__ == "__main__":
     ##Lock1.write_lock()
     #time.sleep(2)
     #Lock1.unlock()
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/output.py b/modules/catalyst/output.py
index 7d6e802c767573350e9c69fb06ab2179fab2b963..eb3cd22824dc2cbc666f76699e7e3bfb18793232 100644 (file)
--- a/modules/catalyst/output.py
+++ b/modules/catalyst/output.py
@@ -20,3 +20,4 @@ def die(message, exitcode=1):
        warn(message)
        sys.exit(exitcode)
 
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/spawn.py b/modules/catalyst/spawn.py
index 11e8497bf32b148cba272ffaeaa33480f88d8e7b..fabe09517c41a0da5f215035b76a85ba7aa36608 100644 (file)
--- a/modules/catalyst/spawn.py
+++ b/modules/catalyst/spawn.py
@@ -319,3 +319,4 @@ def process_exit_code(retval,throw_signals=False):
                 return (retval & 0xff) << 8 # interrupted by signal
 
 
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/target/__init__.py b/modules/catalyst/target/__init__.py
index 8688e0814584e040064b968e4651d57266e8c90b..f39375e28f730f5ca51c8dc292953000b78da308 100644 (file)
--- a/modules/catalyst/target/__init__.py
+++ b/modules/catalyst/target/__init__.py
@@ -29,3 +29,5 @@ def build_target_map():
                if hasattr(targets[x], '__target_map'):
                        target_map.update(targets[x].__target_map)
        return target_map
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/target/embedded.py b/modules/catalyst/target/embedded.py
index 11d0bafee7734a09cbd8ebf91c0afa3e864c11b7..fd49ee452bb4516a42dc131d0ba4eda5cabccceb 100644 (file)
--- a/modules/catalyst/target/embedded.py
+++ b/modules/catalyst/target/embedded.py
@@ -38,3 +38,5 @@ class embedded_target(generic_stage_target):
                msg("embedded root path is " + self.settings["root_path"])
 
 __target_map = {"embedded":embedded_target}
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/target/generic.py b/modules/catalyst/target/generic.py
index 55212015d4a4632a201474d1de0fd9e36c678e35..aea74d3d12f5ce6661cdf07de69af6022d950727 100644 (file)
--- a/modules/catalyst/target/generic.py
+++ b/modules/catalyst/target/generic.py
@@ -62,3 +62,4 @@ class generic_target:
                        cmd("/bin/bash " + self.settings["controller_file"] + " " + command, \
                                action + " script failed.", env=self.env)
 
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/target/grp.py b/modules/catalyst/target/grp.py
index c7348083c9b81c77e4e01cfe4fac379bb70521e1..0f5f9bc52d58199f7fba0ee4ebeebd6279259a26 100644 (file)
--- a/modules/catalyst/target/grp.py
+++ b/modules/catalyst/target/grp.py
@@ -111,3 +111,5 @@ class grp_target(generic_stage_target):
                                            "generate_digests","clear_autoresume"]
 
 __target_map = {"grp":grp_target}
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/target/livecd_stage1.py b/modules/catalyst/target/livecd_stage1.py
index 39667f6a9ac48709a1278f64ae741125886cdddc..bb6404082392421501fadd229b2c2b882db2b414 100644 (file)
--- a/modules/catalyst/target/livecd_stage1.py
+++ b/modules/catalyst/target/livecd_stage1.py
@@ -65,3 +65,5 @@ class livecd_stage1_target(generic_stage_target):
                        generic_stage_target.set_pkgcache_path(self)
 
 __target_map = {"livecd-stage1":livecd_stage1_target}
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/target/livecd_stage2.py b/modules/catalyst/target/livecd_stage2.py
index c566c48021dad45d8596af80c88507c44a5148c0..ac2f939edf35e45dc865b6e8ff91e6b57e5c92e1 100644 (file)
--- a/modules/catalyst/target/livecd_stage2.py
+++ b/modules/catalyst/target/livecd_stage2.py
@@ -135,3 +135,5 @@ class livecd_stage2_target(generic_stage_target):
                self.settings["action_sequence"].append("clear_autoresume")
 
 __target_map = {"livecd-stage2":livecd_stage2_target}
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/target/netboot.py b/modules/catalyst/target/netboot.py
index 63554e23ad4a1dfcc12105094a0e32ef9996377b..f05200781b15aee8e38e330583d3933e39a1a157 100644 (file)
--- a/modules/catalyst/target/netboot.py
+++ b/modules/catalyst/target/netboot.py
@@ -155,3 +155,5 @@ class netboot_target(generic_stage_target):
                                        "remove","empty","unbind","clean","clear_autoresume"]
 
 __target_map = {"netboot":netboot_target}
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/target/snapshot.py b/modules/catalyst/target/snapshot.py
index 5df1610d5c7ac62e37ed9784d75a29d184351b54..d10a5a3d4c8b89546b502e57a58ce5f2d86c0d13 100644 (file)
--- a/modules/catalyst/target/snapshot.py
+++ b/modules/catalyst/target/snapshot.py
@@ -84,3 +84,5 @@ class snapshot_target(catalyst.target.generic.generic_target):
                        os.chmod(myemp,mystat[stat.ST_MODE])
 
 __target_map = {"snapshot":snapshot_target}
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/target/stage1.py b/modules/catalyst/target/stage1.py
index 3004649a5680bbf12d4646ae6bc2edf0663a919e..dde9b32a0ee967fc74acd279a0b44b1198c0633f 100644 (file)
--- a/modules/catalyst/target/stage1.py
+++ b/modules/catalyst/target/stage1.py
@@ -95,3 +95,5 @@ class stage1_target(generic_stage_target):
 
 
 __target_map = {"stage1":stage1_target}
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/target/stage2.py b/modules/catalyst/target/stage2.py
index 8ecad3cef9384d63ca9e08c5f6bd13e67569486f..a8c46ed7fe67d23bca1c0e358e2ae58b368c22f6 100644 (file)
--- a/modules/catalyst/target/stage2.py
+++ b/modules/catalyst/target/stage2.py
@@ -64,3 +64,5 @@ class stage2_target(generic_stage_target):
                                msg()
 
 __target_map = {"stage2":stage2_target}
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/target/stage3.py b/modules/catalyst/target/stage3.py
index 5367a2ac459a7230451aba4acbfd37e4fdcc0e7f..4d630dbb38da6069ae05274ab38238f8966e6fb1 100644 (file)
--- a/modules/catalyst/target/stage3.py
+++ b/modules/catalyst/target/stage3.py
@@ -28,3 +28,5 @@ class stage3_target(generic_stage_target):
                self.settings["cleanables"].extend(["/etc/portage"])
 
 __target_map = {"stage3":stage3_target}
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/target/stage4.py b/modules/catalyst/target/stage4.py
index 074a920e933e1a0f86574ad27c0b8a9d2d02c62e..a42b79c11de4cf321ff42875f065d14efe13b9bb 100644 (file)
--- a/modules/catalyst/target/stage4.py
+++ b/modules/catalyst/target/stage4.py
@@ -37,3 +37,4 @@ class stage4_target(generic_stage_target):
 
 __target_map = {"stage4":stage4_target}
 
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/target/system.py b/modules/catalyst/target/system.py
index 67d5e5fa71480b89e1349380376460cf7074a16b..9d2b6589bf321561ffa495371a59160978af74e2 100644 (file)
--- a/modules/catalyst/target/system.py
+++ b/modules/catalyst/target/system.py
@@ -91,3 +91,5 @@ class system_target(generic_stage_target):
 
 
 __target_map = {"system": system_target}
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/target/tinderbox.py b/modules/catalyst/target/tinderbox.py
index 75f52bc8cf234f217e4af176ab58d2a68919c572..3955506832b62cfa740650f6462f831a928a530e 100644 (file)
--- a/modules/catalyst/target/tinderbox.py
+++ b/modules/catalyst/target/tinderbox.py
@@ -38,3 +38,5 @@ class tinderbox_target(generic_stage_target):
                              "clear_autoresume"]
 
 __target_map = {"tinderbox":tinderbox_target}
+
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/modules/catalyst/util.py b/modules/catalyst/util.py
index 0274d1a7af6cbbfc7665677aedcafc3f12230be0..4c2b03827963c70c212d26835950bf6923b59ef6 100644 (file)
--- a/modules/catalyst/util.py
+++ b/modules/catalyst/util.py
@@ -195,3 +195,4 @@ def addl_arg_parse(myspec,addlargs,requiredspec,validspec):
                if not x in myspec:
                        raise CatalystError, "Required argument \""+x+"\" not specified."
 
+# vim: ts=4 sw=4 sta noet sts=4 ai

diff --git a/targets/stage1/build.py b/targets/stage1/build.py
index bf20bcf3bd48a1a7f1ea7dc92e02f6855e53e2cb..0aa333856ea62fe4073a1bfc375379af59fdfd80 100644 (file)
--- a/targets/stage1/build.py
+++ b/targets/stage1/build.py
@@ -34,3 +34,5 @@ for idx in range(0, len(pkgs)):
        except: pass
 
 for b in buildpkgs: sys.stdout.write(b+" ")
+
+# vim: ts=4 sw=4 sta noet sts=4 ai