[tmcode commit] r310 - in spine/branches/spine_2_2-devel: . lib/Spine tests

[oss...@gmail.com]

Author: richard
Date: Fri Nov 20 08:02:19 2009
New Revision: 310

Log:
Final commit to bring in-line with trunk, initial tests show this revision to be working and backwards compatible. New PackageManager code is alpha and subject to change.

Modified:
spine/branches/spine_2_2-devel/LICENSE (contents, props changed)
spine/branches/spine_2_2-devel/lib/Spine/Data.pm
spine/branches/spine_2_2-devel/spine-mgmt
spine/branches/spine_2_2-devel/tests/spine-util.t
spine/branches/spine_2_2-devel/ui (contents, props changed)

Modified: spine/branches/spine_2_2-devel/LICENSE
==============================================================================
--- spine/branches/spine_2_2-devel/LICENSE Fri Nov 20 07:44:32 2009 (r309)
+++ spine/branches/spine_2_2-devel/LICENSE Fri Nov 20 08:02:19 2009 (r310)
@@ -672,3 +672,5 @@
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+

Modified: spine/branches/spine_2_2-devel/lib/Spine/Data.pm
==============================================================================
--- spine/branches/spine_2_2-devel/lib/Spine/Data.pm Fri Nov 20 07:44:32 2009 (r309)
+++ spine/branches/spine_2_2-devel/lib/Spine/Data.pm Fri Nov 20 08:02:19 2009 (r310)
@@ -415,7 +415,7 @@

if ($keyname =~ m/(?:(?:^(?:\.|c_\#).*)|(?:.*(?:~|\#)$))/) {
$self->error("ignoring $directory/$keyname because of lame"
- . ' file name');
+ . ' file name', 'err');
next;
}

@@ -704,7 +704,7 @@
# if we're in an overlay template instance. Ain't life grand?
if ($in_template and not defined($Spine::Plugin::Templates::KEYTT)) {
$self->error("We've got an overlay template that's trying to call "
- . "Spine::Data::set($key). This is bad.");
+ . "Spine::Data::set($key). This is bad.", 'err ');
die (Template::Exception->new('Spine::Data::set()',
'Overlay template trying to call ' .
"Spine::Data::set($key). Bad template"));

Modified: spine/branches/spine_2_2-devel/spine-mgmt
==============================================================================
--- spine/branches/spine_2_2-devel/spine-mgmt Fri Nov 20 07:44:32 2009 (r309)
+++ spine/branches/spine_2_2-devel/spine-mgmt Fri Nov 20 08:02:19 2009 (r310)
@@ -58,43 +58,10 @@
use constant DEFAULT_CONFIG => {
spine => {
StateDir => '/var/spine-mgmt',
- ConfigSource => 'ISO9660',
- Profile => 'StandardPlugins',
- Parser => 'pureTT',
SyslogIdent => 'spine-mgmt',
SyslogFacility => 'local3',
SyslogOptions => 'ndelay,pid',
},
-
- DefaultPlugins => {
- 'DISCOVERY/populate' => 'DryRun SystemInfo',
- 'DISCOVERY/policy-selection' => 'DescendOrder',
- 'PARSE/complete' => 'Interpolate',
- },
-
- FileSystem => {
- Path => '/software/spine/config'
- },
-
- ISO9660 => {
- URL => 'http://repository/cgi-bin/rcrb.pl',
- Destination => '/var/spine-mgmt/configballs',
- Timeout => 5
- },
-
- StandardPlugins => {
- PREPARE => 'PrintData Templates Overlay',
- EMIT => 'Templates',
- APPLY => 'Overlay RestartServices Finalize',
- CLEAN => 'Overlay'
- },
-
- FirstRun => {
- PREPARE => 'PrintData Templates Overlay',
- EMIT => 'FirstRun Templates',
- APPLY => 'Overlay Finalize',
- CLEAN => 'Overlay',
- }
};

#
@@ -145,7 +112,7 @@

if (defined($conf_file))
{
- my @cfiles = ($conf_file);
+ @cfiles = ($conf_file);
}

foreach my $file (@cfiles)
@@ -167,8 +134,8 @@

if (not defined($CONFIG))
{
- print STDERR "spine-mgmt: No config file found. Using hardcoded defaults.\n";
- $CONFIG = DEFAULT_CONFIG;
+ print STDERR "spine-mgmt: No config file found.\n";
+ goto failure;
}

$CONFIG->{spine}->{Profile} = $profile if defined($profile);

Modified: spine/branches/spine_2_2-devel/tests/spine-util.t
==============================================================================
--- spine/branches/spine_2_2-devel/tests/spine-util.t Fri Nov 20 07:44:32 2009 (r309)
+++ spine/branches/spine_2_2-devel/tests/spine-util.t Fri Nov 20 08:02:19 2009 (r310)
@@ -78,12 +78,12 @@
unlink($file);

### Test Spine::Util::Exec
-$data->{dryrun} = 0;
+$data->{c_dryrun} = 0;

my %config = (c => $data,
- exec => "echo",
+ exec => "printf",
quiet => 1,
- args => [ "-ne", 'test 1\ntest 2\ntest 3' ],
+ args => [ 'test 1\ntest 2\ntest 3' ],
inert => 0);

my $exec_controler = Spine::Util::create_exec(%config);

Modified: spine/branches/spine_2_2-devel/ui
==============================================================================
--- spine/branches/spine_2_2-devel/ui Fri Nov 20 07:44:32 2009 (r309)
+++ spine/branches/spine_2_2-devel/ui Fri Nov 20 08:02:19 2009 (r310)
@@ -23,7 +23,7 @@

use strict;

-use lib qw(/usr/lib/spine);
+use lib qw(/usr/lib/spine-mgmt);

use Getopt::Long;
use Spine::Util;