From 045fd6c539ca9e240c289678b40a3b09e629e4d9 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Wed, 27 May 2009 08:40:54 -0700 Subject: [PATCH] Put the vim modeline in all source files to avoid any more tab/space mess. --- modules/catalyst/__init__.py | 2 ++ modules/catalyst/arch/__init__.py | 2 ++ modules/catalyst/arch/alpha.py | 2 ++ modules/catalyst/arch/amd64.py | 1 + modules/catalyst/arch/arm.py | 2 ++ modules/catalyst/arch/hppa.py | 1 + modules/catalyst/arch/ia64.py | 1 + modules/catalyst/arch/mips.py | 1 + modules/catalyst/arch/powerpc.py | 1 + modules/catalyst/arch/s390.py | 1 + modules/catalyst/arch/sh.py | 1 + modules/catalyst/arch/sparc.py | 1 + modules/catalyst/arch/x86.py | 1 + modules/catalyst/config.py | 2 ++ modules/catalyst/error.py | 1 + modules/catalyst/hash.py | 1 + modules/catalyst/lock.py | 2 ++ modules/catalyst/output.py | 1 + modules/catalyst/spawn.py | 1 + modules/catalyst/target/__init__.py | 2 ++ modules/catalyst/target/embedded.py | 2 ++ modules/catalyst/target/generic.py | 1 + modules/catalyst/target/grp.py | 2 ++ modules/catalyst/target/livecd_stage1.py | 2 ++ modules/catalyst/target/livecd_stage2.py | 2 ++ modules/catalyst/target/netboot.py | 2 ++ modules/catalyst/target/snapshot.py | 2 ++ modules/catalyst/target/stage1.py | 2 ++ modules/catalyst/target/stage2.py | 2 ++ modules/catalyst/target/stage3.py | 2 ++ modules/catalyst/target/stage4.py | 1 + modules/catalyst/target/system.py | 2 ++ modules/catalyst/target/tinderbox.py | 2 ++ modules/catalyst/util.py | 1 + targets/stage1/build.py | 2 ++ 35 files changed, 54 insertions(+) diff --git a/modules/catalyst/__init__.py b/modules/catalyst/__init__.py index a7d2aaff..66b15669 100644 --- 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 99628eda..f5010f11 100644 --- 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 71e3e652..8f6606f6 100644 --- 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 ce70ccb5..c6e00182 100644 --- 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 239cf576..65b8e46a 100644 --- 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 3c75c388..b20b48a8 100644 --- 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 be7f636e..6a54b3d9 100644 --- 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 6d3b22df..7234b65a 100644 --- 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 d75e23d5..53969e90 100644 --- 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 107a7e91..3e51feae 100644 --- 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 fe169d61..319ced2f 100644 --- 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 14ee1e0f..0e3519a9 100644 --- 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 f4e76a0b..8b1cfd16 100644 --- 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 b6f0a7fb..fc36ce27 100644 --- 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 ef028615..381048a8 100644 --- 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 43ee89ed..b30a644a 100644 --- 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 8e79ac87..63206a6f 100644 --- 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 7d6e802c..eb3cd228 100644 --- 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 11e8497b..fabe0951 100644 --- 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 8688e081..f39375e2 100644 --- 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 11d0bafe..fd49ee45 100644 --- 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 55212015..aea74d3d 100644 --- 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 c7348083..0f5f9bc5 100644 --- 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 39667f6a..bb640408 100644 --- 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 c566c480..ac2f939e 100644 --- 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 63554e23..f0520078 100644 --- 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 5df1610d..d10a5a3d 100644 --- 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 3004649a..dde9b32a 100644 --- 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 8ecad3ce..a8c46ed7 100644 --- 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 5367a2ac..4d630dbb 100644 --- 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 074a920e..a42b79c1 100644 --- 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 67d5e5fa..9d2b6589 100644 --- 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 75f52bc8..39555068 100644 --- 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 0274d1a7..4c2b0382 100644 --- 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 bf20bcf3..0aa33385 100644 --- 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 -- 2.26.2