catalyst.git
15 years agoMove all hash and contents functions to catalyst.hash
Andrew Gaffney [Sun, 11 Jan 2009 22:46:48 +0000 (16:46 -0600)]
Move all hash and contents functions to catalyst.hash

15 years agoMove countdown() from catalyst.support to catalyst.util
Andrew Gaffney [Sun, 11 Jan 2009 22:15:07 +0000 (16:15 -0600)]
Move countdown() from catalyst.support to catalyst.util

15 years agoMove generate_contents() from catalyst.support to catalyst.util
Andrew Gaffney [Sun, 11 Jan 2009 22:10:42 +0000 (16:10 -0600)]
Move generate_contents() from catalyst.support to catalyst.util

15 years agoMove touch() from catalyst.support to catalyst.util
Andrew Gaffney [Sun, 11 Jan 2009 22:08:38 +0000 (16:08 -0600)]
Move touch() from catalyst.support to catalyst.util

15 years agoMove ismount() and pathcompare() from catalyst.support to catalyst.util
Andrew Gaffney [Sun, 11 Jan 2009 22:06:13 +0000 (16:06 -0600)]
Move ismount() and pathcompare() from catalyst.support to catalyst.util

15 years agoRemove unused function hexify()
Andrew Gaffney [Sun, 11 Jan 2009 21:59:37 +0000 (15:59 -0600)]
Remove unused function hexify()

15 years agoMove normpath() from catalyst.support to catalyst.util
Andrew Gaffney [Sun, 11 Jan 2009 21:58:43 +0000 (15:58 -0600)]
Move normpath() from catalyst.support to catalyst.util

15 years agoMove list_to_string() from catalyst.support to catalyst.util
Andrew Gaffney [Sun, 11 Jan 2009 21:47:29 +0000 (15:47 -0600)]
Move list_to_string() from catalyst.support to catalyst.util

15 years agoMove list_bashify() from catalyst.support to catalyst.util
Andrew Gaffney [Sun, 11 Jan 2009 21:42:21 +0000 (15:42 -0600)]
Move list_bashify() from catalyst.support to catalyst.util

15 years agoReplace catalyst.support.read_from_clst() with catalyst.util.readfile() and update...
Andrew Gaffney [Sun, 11 Jan 2009 21:31:01 +0000 (15:31 -0600)]
Replace catalyst.support.read_from_clst() with catalyst.util.readfile() and update references

15 years agoModify global import from catalyst.support to just import what's needed
Andrew Gaffney [Sun, 11 Jan 2009 18:39:19 +0000 (12:39 -0600)]
Modify global import from catalyst.support to just import what's needed

15 years agoMove find_binary() from catalyst.support to catalyst.util
Andrew Gaffney [Sun, 11 Jan 2009 18:36:25 +0000 (12:36 -0600)]
Move find_binary() from catalyst.support to catalyst.util

15 years agoMove msg(), warn(), and die() to catalyst.output and update all references
Andrew Gaffney [Sun, 11 Jan 2009 18:20:35 +0000 (12:20 -0600)]
Move msg(), warn(), and die() to catalyst.output and update all references

15 years agoLoad defaults into myconf before parsing config
Andrew Gaffney [Sun, 11 Jan 2009 18:11:54 +0000 (12:11 -0600)]
Load defaults into myconf before parsing config

15 years agoCondense code that checks for various things in 'options' to use a loop
Andrew Gaffney [Sun, 11 Jan 2009 17:58:28 +0000 (11:58 -0600)]
Condense code that checks for various things in 'options' to use a loop

15 years agoGet rid of arches and targets classes and move functions into the module instead
Andrew Gaffney [Sun, 11 Jan 2009 17:44:13 +0000 (11:44 -0600)]
Get rid of arches and targets classes and move functions into the module instead

15 years agoMore trailing whitespace cleanups
Andrew Gaffney [Sun, 11 Jan 2009 06:36:34 +0000 (00:36 -0600)]
More trailing whitespace cleanups

15 years agokill trailing whitespace
Andrew Gaffney [Sun, 11 Jan 2009 06:33:39 +0000 (00:33 -0600)]
kill trailing whitespace

15 years agokill trailing whitespace
Andrew Gaffney [Sun, 11 Jan 2009 06:33:16 +0000 (00:33 -0600)]
kill trailing whitespace

15 years agoKill lots and lots of trailing whitespace in .py files
Andrew Gaffney [Sun, 11 Jan 2009 06:32:09 +0000 (00:32 -0600)]
Kill lots and lots of trailing whitespace in .py files

15 years agoFix up a few bad replacements from previous commit
Andrew Gaffney [Sun, 11 Jan 2009 06:05:44 +0000 (00:05 -0600)]
Fix up a few bad replacements from previous commit

15 years agoDo a mass sed to fix up all remaining usage of has_key()
Andrew Gaffney [Sun, 11 Jan 2009 06:01:44 +0000 (00:01 -0600)]
Do a mass sed to fix up all remaining usage of has_key()

15 years agoClean up instances of has_key() for py3k
Andrew Gaffney [Sun, 11 Jan 2009 04:29:45 +0000 (22:29 -0600)]
Clean up instances of has_key() for py3k

15 years agoWe don't need to pass conf_values since it's a global var
Andrew Gaffney [Sun, 11 Jan 2009 03:38:18 +0000 (21:38 -0600)]
We don't need to pass conf_values since it's a global var

15 years agoPre-split options from config file and remove unnecessary imported modules
Andrew Gaffney [Sun, 11 Jan 2009 03:36:18 +0000 (21:36 -0600)]
Pre-split options from config file and remove unnecessary imported modules

15 years agoMove code to verify digest and hash functions to a separate function
Andrew Gaffney [Sun, 11 Jan 2009 03:17:00 +0000 (21:17 -0600)]
Move code to verify digest and hash functions to a separate function

15 years agoAllow build_target() to re-raise the exception for the top-level handler to catch it
Andrew Gaffney [Sun, 11 Jan 2009 03:08:31 +0000 (21:08 -0600)]
Allow build_target() to re-raise the exception for the top-level handler to catch it

15 years agoMove catalyst.support import to top of file
Andrew Gaffney [Sun, 11 Jan 2009 03:06:28 +0000 (21:06 -0600)]
Move catalyst.support import to top of file

15 years agoRemove check for sys.argv length since we already check for needed arguments later on
Andrew Gaffney [Sun, 11 Jan 2009 03:02:59 +0000 (21:02 -0600)]
Remove check for sys.argv length since we already check for needed arguments later on

15 years agoRename version() to show_version()
Andrew Gaffney [Sun, 11 Jan 2009 03:01:49 +0000 (21:01 -0600)]
Rename version() to show_version()

15 years agoRemove import_modules()
Andrew Gaffney [Sun, 11 Jan 2009 02:59:41 +0000 (20:59 -0600)]
Remove import_modules()

15 years agoRemove references to generic_stage_target
Andrew Gaffney [Sun, 11 Jan 2009 02:57:44 +0000 (20:57 -0600)]
Remove references to generic_stage_target

15 years agoRemove _target from target module filenames, since they're already in target/ subdir
Andrew Gaffney [Sun, 11 Jan 2009 02:53:30 +0000 (20:53 -0600)]
Remove _target from target module filenames, since they're already in target/ subdir

15 years agoRemove builder.py and all references
Andrew Gaffney [Sun, 11 Jan 2009 02:44:20 +0000 (20:44 -0600)]
Remove builder.py and all references

15 years agoMove catalyst_support.py to catalyst.support and update references
Andrew Gaffney [Sun, 11 Jan 2009 02:26:07 +0000 (20:26 -0600)]
Move catalyst_support.py to catalyst.support and update references

15 years agoMove catalyst_lock.py to catalyst/lock.py and update references
Andrew Gaffney [Sun, 11 Jan 2009 02:17:53 +0000 (20:17 -0600)]
Move catalyst_lock.py to catalyst/lock.py and update references

15 years agoMove target module loading logic into build_target_map() in catalyst.target module
Andrew Gaffney [Sun, 11 Jan 2009 01:54:36 +0000 (19:54 -0600)]
Move target module loading logic into build_target_map() in catalyst.target module

15 years agoAdd target map in each target module and remove register() function
Andrew Gaffney [Sun, 11 Jan 2009 01:30:24 +0000 (19:30 -0600)]
Add target map in each target module and remove register() function
Change catalyst program to load target modules with catalyst.target.targets class
Remove required_build_targets and valid_build_targets from catalyst_support.py, since we can scan the dir now

15 years agoMove all *_target.py modules under modules/catalyst/target and create parent catalyst...
Andrew Gaffney [Sun, 11 Jan 2009 01:17:54 +0000 (19:17 -0600)]
Move all *_target.py modules under modules/catalyst/target and create parent catalyst.target module

15 years agoadd note about module loading method
Andrew Gaffney [Sun, 11 Jan 2009 01:08:54 +0000 (19:08 -0600)]
add note about module loading method

15 years agoRemove hard-coded arch list now that find_arch_modules() is known to work
Andrew Gaffney [Sun, 11 Jan 2009 01:07:45 +0000 (19:07 -0600)]
Remove hard-coded arch list now that find_arch_modules() is known to work

15 years agoMove subarch and maching maps to bottom of arch files, since the classes aren't defin...
Andrew Gaffney [Sun, 11 Jan 2009 00:59:23 +0000 (18:59 -0600)]
Move subarch and maching maps to bottom of arch files, since the classes aren't defined yet at the top

15 years agoForgot the sh arch module
Andrew Gaffney [Sun, 11 Jan 2009 00:51:05 +0000 (18:51 -0600)]
Forgot the sh arch module

15 years agoMove subarch and machine map information to variables at top of each arch module...
Andrew Gaffney [Sun, 11 Jan 2009 00:49:45 +0000 (18:49 -0600)]
Move subarch and machine map information to variables at top of each arch module and get rid of register() function

15 years agoAdd catalyst.util.load_module() function
Andrew Gaffney [Sun, 11 Jan 2009 00:39:02 +0000 (18:39 -0600)]
Add catalyst.util.load_module() function
Move arch modules under modules/catalyst/arch
Add catalyst.arch.arches class to assist in loading arch modules

15 years agoadd .gitignore file with *.py[co]
Andrew Gaffney [Sun, 11 Jan 2009 00:36:09 +0000 (18:36 -0600)]
add .gitignore file with *.py[co]

15 years agoChange __version__ to 2.99 for catalyst_3 branch
Andrew Gaffney [Sat, 10 Jan 2009 23:18:52 +0000 (17:18 -0600)]
Change __version__ to 2.99 for catalyst_3 branch

15 years agoAdd note about metadata_overlay being default in 2.1.6
Andrew Gaffney [Fri, 9 Jan 2009 01:55:21 +0000 (19:55 -0600)]
Add note about metadata_overlay being default in 2.1.6

15 years agoUpdated the AUTHORS section and the header for the ChangeLog, to reflect that individ...
Chris Gianelloni [Fri, 9 Jan 2009 00:21:32 +0000 (16:21 -0800)]
Updated the AUTHORS section and the header for the ChangeLog, to reflect that individual authors now retain their copyright to code they submit.

15 years agoRewrote TODO to make it clearer and added a ton of new items to it.
Chris Gianelloni [Thu, 8 Jan 2009 23:45:13 +0000 (15:45 -0800)]
Rewrote TODO to make it clearer and added a ton of new items to it.

15 years agoscrew you python...hard
Andrew Gaffney [Fri, 2 Jan 2009 16:18:26 +0000 (10:18 -0600)]
screw you python...hard

15 years agoDisable removal of 'target_path' when build starts
Andrew Gaffney [Fri, 2 Jan 2009 14:00:23 +0000 (08:00 -0600)]
Disable removal of 'target_path' when build starts

15 years agoApply patch from armin76 to actually make use of the busybox_config value in the...
Andrew Gaffney [Fri, 26 Dec 2008 13:29:04 +0000 (07:29 -0600)]
Apply patch from armin76 to actually make use of the busybox_config value in the spec

15 years agoAdd support for gk's --busybox-config= option
Andrew Gaffney [Wed, 24 Dec 2008 18:56:51 +0000 (12:56 -0600)]
Add support for gk's --busybox-config= option

15 years agoMissing / before 'iso'
Andrew Gaffney [Tue, 23 Dec 2008 03:11:19 +0000 (21:11 -0600)]
Missing / before 'iso'

15 years agoAdd support for purging to snapshot target
Andrew Gaffney [Mon, 22 Dec 2008 04:47:50 +0000 (22:47 -0600)]
Add support for purging to snapshot target

15 years agoAdd mix-in cdtar idea to TODO
Andrew Gaffney [Sun, 21 Dec 2008 22:22:24 +0000 (16:22 -0600)]
Add mix-in cdtar idea to TODO

15 years agoMerge branch 'master' of git+ssh://git@wolf31o2.org/projs/catalyst
Andrew Gaffney [Sun, 21 Dec 2008 22:17:12 +0000 (16:17 -0600)]
Merge branch 'master' of git+ssh://git@wolf31o2.org/projs/catalyst

Conflicts:
ChangeLog

15 years agoRemove old isolinux-3.09 cdtar files
Andrew Gaffney [Sun, 21 Dec 2008 22:16:00 +0000 (16:16 -0600)]
Remove old isolinux-3.09 cdtar files

15 years agoUpdate cdtar files to isolinux-3.72 and latest memtest86+-2.10
Andrew Gaffney [Sun, 21 Dec 2008 22:13:38 +0000 (16:13 -0600)]
Update cdtar files to isolinux-3.72 and latest memtest86+-2.10

15 years agoMarking this 2.0.6.903 for testing.
Chris Gianelloni [Fri, 19 Dec 2008 22:53:36 +0000 (14:53 -0800)]
Marking this 2.0.6.903 for testing.

15 years agoDisable copying of nb-busybox.cf since it isn't used anyway
Andrew Gaffney [Fri, 12 Dec 2008 19:08:12 +0000 (13:08 -0600)]
Disable copying of nb-busybox.cf since it isn't used anyway

15 years agophp vs. python fail
Andrew Gaffney [Mon, 8 Dec 2008 13:55:39 +0000 (07:55 -0600)]
php vs. python fail

15 years agoA few typo and other minor fixes as reported by armin76
Andrew Gaffney [Sun, 7 Dec 2008 20:14:47 +0000 (14:14 -0600)]
A few typo and other minor fixes as reported by armin76

15 years agoAdd support for digests="all" for gentoo bug #209611
Andrew Gaffney [Sun, 7 Dec 2008 05:53:09 +0000 (23:53 -0600)]
Add support for digests="all" for gentoo bug #209611

15 years agoAutomatically append --netboot to GK_ARGS for netboot2 target
Andrew Gaffney [Sun, 7 Dec 2008 05:04:43 +0000 (23:04 -0600)]
Automatically append --netboot to GK_ARGS for netboot2 target
Remove explicit --initramfs-overlay=/tmp/image from netboot2 example spec

15 years agoRemove evil hacks that copy gk files around for netboot2
Andrew Gaffney [Sun, 7 Dec 2008 04:01:50 +0000 (22:01 -0600)]
Remove evil hacks that copy gk files around for netboot2

15 years agoBumping version for release.
Chris Gianelloni [Thu, 4 Dec 2008 17:13:37 +0000 (09:13 -0800)]
Bumping version for release.

15 years agoDefault to umask 022 for spawn() unless otherwise specified for gentoo bug #239048
Andrew Gaffney [Mon, 1 Dec 2008 13:17:57 +0000 (07:17 -0600)]
Default to umask 022 for spawn() unless otherwise specified for gentoo bug #239048

15 years agoAdd support for -P/--purgeonly option
Andrew Gaffney [Sat, 29 Nov 2008 02:04:15 +0000 (20:04 -0600)]
Add support for -P/--purgeonly option

16 years agoUpdated README to tell the user where to locate catalyst.conf if not using an ebuild...
Chris Gianelloni [Fri, 31 Oct 2008 09:52:27 +0000 (02:52 -0700)]
Updated README to tell the user where to locate catalyst.conf if not using an ebuild.  Thanks to Claus Boehmer <Claus.Boehmer@gmx.de> for pointing it out.

16 years agoChangeLog update.
Chris Gianelloni [Fri, 31 Oct 2008 07:02:20 +0000 (00:02 -0700)]
ChangeLog update.

16 years agoMerge branch 'master' of git+ssh://git@wolf31o2.org/projs/catalyst
Chris Gianelloni [Fri, 31 Oct 2008 07:01:22 +0000 (00:01 -0700)]
Merge branch 'master' of git+ssh://git@wolf31o2.org/projs/catalyst

16 years agoKicking out a 2.0.6.901 release for testing.
Chris Gianelloni [Fri, 31 Oct 2008 07:01:12 +0000 (00:01 -0700)]
Kicking out a 2.0.6.901 release for testing.

16 years agoAutomatically prepend build dir path to livecd/iso if it's not an absolute path
agaffney [Mon, 29 Sep 2008 02:52:32 +0000 (21:52 -0500)]
Automatically prepend build dir path to livecd/iso if it's not an absolute path

16 years agoUpdate TODO with placeholder idea
agaffney [Sun, 28 Sep 2008 20:05:27 +0000 (15:05 -0500)]
Update TODO with placeholder idea

16 years agoCreate catalyst.util module with capture_traceback() and print_traceback() functions
agaffney [Sun, 7 Sep 2008 19:23:29 +0000 (14:23 -0500)]
Create catalyst.util module with capture_traceback() and print_traceback() functions
Capture and print traceback when build fails instead of letting python do it

16 years agoSwitch commandline spec value parsing to use catalyst.config.ConfigParser
agaffney [Sun, 7 Sep 2008 19:02:03 +0000 (14:02 -0500)]
Switch commandline spec value parsing to use catalyst.config.ConfigParser

16 years agoA few fixes to ParserBase after actually testing it
agaffney [Sun, 7 Sep 2008 04:21:16 +0000 (23:21 -0500)]
A few fixes to ParserBase after actually testing it
switch to parsing config file with ConfigParser

16 years agoMore indecisiveness..move util.spec to config.SpecParser
agaffney [Sun, 7 Sep 2008 01:23:07 +0000 (20:23 -0500)]
More indecisiveness..move util.spec to config.SpecParser

16 years agoRename catalyst.spec to catalyst.util
agaffney [Sat, 6 Sep 2008 18:09:06 +0000 (13:09 -0500)]
Rename catalyst.spec to catalyst.util
Move spec_dump() into spec class
Modify catalyst to use new spec class

16 years agoAdd __init__.py file and import line
agaffney [Sat, 6 Sep 2008 04:19:56 +0000 (23:19 -0500)]
Add __init__.py file and import line

16 years agoInitial commit of modules/catalyst/spec.py
agaffney [Sat, 6 Sep 2008 03:41:52 +0000 (22:41 -0500)]
Initial commit of modules/catalyst/spec.py

16 years agoUpdating x86/amd64 arch support. Original patches by William Cooke <gentoo@wcooke...
Chris Gianelloni [Wed, 30 Jul 2008 16:32:27 +0000 (09:32 -0700)]
Updating x86/amd64 arch support.  Original patches by William Cooke <gentoo@wcooke.org> and reported to Gentoo bug #224429, modified by me.

16 years agoRemoving all deprecated interfaces. We no longer wish to support them and they're...
Chris Gianelloni [Mon, 28 Jul 2008 21:15:19 +0000 (14:15 -0700)]
Removing all deprecated interfaces.  We no longer wish to support them and they're not needed.  Anyone using a pre-2.x spec file will need to update their specs, anyway.

16 years agoIt helps if I update the ChangeLog properly.
Chris Gianelloni [Thu, 24 Jul 2008 19:08:31 +0000 (12:08 -0700)]
It helps if I update the ChangeLog properly.

16 years agoRemoving livecd/files/Getting_Online.txt since it was quite outdated.
Chris Gianelloni [Thu, 24 Jul 2008 19:07:10 +0000 (12:07 -0700)]
Removing livecd/files/Getting_Online.txt since it was quite outdated.

16 years agoUpdated ChangeLog.
Chris Gianelloni [Thu, 24 Jul 2008 18:59:36 +0000 (11:59 -0700)]
Updated ChangeLog.

16 years agoInitial commit after creating the git repository.
Chris Gianelloni [Thu, 24 Jul 2008 18:39:18 +0000 (11:39 -0700)]
Initial commit after creating the git repository.

16 years agoAdd gconf settings for gnome-screensaver to disable locking by default. This is...
Chris Gianelloni [Thu, 29 May 2008 04:29:47 +0000 (04:29 +0000)]
Add gconf settings for gnome-screensaver to disable locking by default.  This is 2.0.6 final.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1411 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoAdd armv5tel to arm host list
Andrew Gaffney [Wed, 14 May 2008 01:18:05 +0000 (01:18 +0000)]
Add armv5tel to arm host list

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1410 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoIf we don't have a distcc user, we need to reinstall distcc, even if it's been built...
Chris Gianelloni [Fri, 9 May 2008 04:19:26 +0000 (04:19 +0000)]
If we don't have a distcc user, we need to reinstall distcc, even if it's been built with the right USE.  This mainly affects stage1/stage2.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1409 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoWe need to run distcc-config --install, since we won't be installing into ROOT=/...
Chris Gianelloni [Fri, 9 May 2008 03:59:30 +0000 (03:59 +0000)]
We need to run distcc-config --install, since we won't be installing into ROOT=/ for stage1, and we have to use --noreplace to keep from wiping any installed versions of distcc.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1408 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoAdd a couple of distcc-related items to TODO.
Chris Gianelloni [Fri, 9 May 2008 02:26:39 +0000 (02:26 +0000)]
Add a couple of distcc-related items to TODO.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1407 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoWe don't want to run setup_myfeatures in preclean, but still want to update the envir...
Chris Gianelloni [Fri, 9 May 2008 01:49:44 +0000 (01:49 +0000)]
We don't want to run setup_myfeatures in preclean, but still want to update the environment and show our debug information.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1406 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoRemove the die on LIBDIR check, since it won't be set on non-multilib profiles. ...
Chris Gianelloni [Fri, 25 Apr 2008 23:59:50 +0000 (23:59 +0000)]
Remove the die on LIBDIR check, since it won't be set on non-multilib profiles.  We can now run debug in preclean again.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1405 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoLet's not try to chmod a dangling symlink.
Chris Gianelloni [Fri, 25 Apr 2008 23:57:01 +0000 (23:57 +0000)]
Let's not try to chmod a dangling symlink.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1404 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoAdded emerge --info to debug output. I don't know why I didn't add it before.
Chris Gianelloni [Fri, 25 Apr 2008 15:16:48 +0000 (15:16 +0000)]
Added emerge --info to debug output.  I don't know why I didn't add it before.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1403 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoWe probably shouldn't be running our debug functions in our stages. Let's fix this.
Chris Gianelloni [Fri, 25 Apr 2008 02:21:26 +0000 (02:21 +0000)]
We probably shouldn't be running our debug functions in our stages.  Let's fix this.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1402 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoAdded a get_libdir call and fail if we don't have a valid LIBDIR when using debug.
Chris Gianelloni [Thu, 24 Apr 2008 02:03:40 +0000 (02:03 +0000)]
Added a get_libdir call and fail if we don't have a valid LIBDIR when using debug.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1401 d1e1f19c-881f-0410-ab34-b69fee027534