[Bps-public-commit] Shipwright branch, master, updated. a02a18f64524eb2352e03262acee0b57f4ce80bf
? sunnavy
sunnavy at bestpractical.com
Fri Oct 22 22:18:49 EDT 2010
The branch, master has been updated
via a02a18f64524eb2352e03262acee0b57f4ce80bf (commit)
from b76e2fd2a1be534249128f78c7ac721f0f670d80 (commit)
Summary of changes:
lib/Shipwright/Script/Create.pm | 2 +-
lib/Shipwright/Script/Defaultbranch.pm | 2 +-
lib/Shipwright/Script/Delete.pm | 2 +-
lib/Shipwright/Script/Flags.pm | 4 +-
lib/Shipwright/Script/Import.pm | 2 +-
lib/Shipwright/Script/Ktf.pm | 2 +-
lib/Shipwright/Script/Maintain.pm | 4 +-
lib/Shipwright/Script/Relocate.pm | 2 +-
lib/Shipwright/Script/Rename.pm | 2 +-
lib/Shipwright/Script/Update.pm | 2 +-
share/bin/shipwright-utility | 4 +-
share/etc/shipwright-utility | 2 +-
t/71.script_cmds.t | 34 ++++++++++++++++----------------
13 files changed, 32 insertions(+), 32 deletions(-)
- Log -----------------------------------------------------------------
commit a02a18f64524eb2352e03262acee0b57f4ce80bf
Author: sunnavy <sunnavy at bestpractical.com>
Date: Sat Oct 23 10:07:29 2010 +0800
with success is not good english
diff --git a/lib/Shipwright/Script/Create.pm b/lib/Shipwright/Script/Create.pm
index 091bb02..ffa87b3 100644
--- a/lib/Shipwright/Script/Create.pm
+++ b/lib/Shipwright/Script/Create.pm
@@ -19,7 +19,7 @@ sub run {
my $shipwright = Shipwright->new( repository => $self->repository, );
$shipwright->backend->initialize();
- $self->log->fatal( 'created with success' );
+ $self->log->fatal( 'successfully created' );
}
1;
diff --git a/lib/Shipwright/Script/Defaultbranch.pm b/lib/Shipwright/Script/Defaultbranch.pm
index 8d61a3d..b773497 100644
--- a/lib/Shipwright/Script/Defaultbranch.pm
+++ b/lib/Shipwright/Script/Defaultbranch.pm
@@ -26,7 +26,7 @@ sub run {
( $default, grep { $_ ne $default } @{ $branches->{$name} } );
$shipwright->backend->branches($branches);
$self->log->fatal(
- "set default branch for $name with success, now it's $default");
+ "successfully set default branch for $name, now it's $default");
}
else {
confess_or_die "$name doesn't have branches $default.
diff --git a/lib/Shipwright/Script/Delete.pm b/lib/Shipwright/Script/Delete.pm
index d6dbbfa..f0942e1 100644
--- a/lib/Shipwright/Script/Delete.pm
+++ b/lib/Shipwright/Script/Delete.pm
@@ -62,7 +62,7 @@ sub run {
for my $name (@names) {
$shipwright->backend->trim( name => $name );
}
- $self->log->fatal( "deleted @names with success" );
+ $self->log->fatal( "successfully deleted @names" );
}
}
diff --git a/lib/Shipwright/Script/Flags.pm b/lib/Shipwright/Script/Flags.pm
index 489fbee..8d01aed 100644
--- a/lib/Shipwright/Script/Flags.pm
+++ b/lib/Shipwright/Script/Flags.pm
@@ -85,7 +85,7 @@ sub _show_flags {
my $flags_info;
if ( $self->mandatory ) {
- $self->log->fatal( 'set mandatory flags with success' ) if $changed;
+ $self->log->fatal( 'successfully set mandatory flags' ) if $changed;
if ( @{ $flags->{__mandatory}{$name} || [] } ) {
$flags_info = join ', ', @{ $flags->{__mandatory}{$name} };
}
@@ -95,7 +95,7 @@ sub _show_flags {
$self->log->fatal( "mandatory flags of $name are $flags_info" );
}
else {
- $self->log->fatal( 'set flags with success' ) if $changed;
+ $self->log->fatal( 'successfully set flags' ) if $changed;
if ( @{ $flags->{$name} || [] } ) {
$flags_info = join ', ', @{ $flags->{$name} };
}
diff --git a/lib/Shipwright/Script/Import.pm b/lib/Shipwright/Script/Import.pm
index 3c4f0b7..8f66b8c 100644
--- a/lib/Shipwright/Script/Import.pm
+++ b/lib/Shipwright/Script/Import.pm
@@ -247,7 +247,7 @@ sub run {
}
- $self->log->fatal( 'imported with success' );
+ $self->log->fatal( 'successfully imported' );
}
diff --git a/lib/Shipwright/Script/Ktf.pm b/lib/Shipwright/Script/Ktf.pm
index 5bbb7e0..63ed7fc 100644
--- a/lib/Shipwright/Script/Ktf.pm
+++ b/lib/Shipwright/Script/Ktf.pm
@@ -56,7 +56,7 @@ sub _show_ktf {
else {
if ( defined $self->set ) {
$self->log->fatal(
- "set known test failure condition for $name with success");
+ "successfully set known test failure condition for $name");
}
$self->log->fatal( "the condition of $name is: " . ( $ktf->{$name} || 'undef' ) );
diff --git a/lib/Shipwright/Script/Maintain.pm b/lib/Shipwright/Script/Maintain.pm
index 7058985..6eabaa8 100644
--- a/lib/Shipwright/Script/Maintain.pm
+++ b/lib/Shipwright/Script/Maintain.pm
@@ -37,7 +37,7 @@ sub run {
qw/skip_requires skip_recommends skip_build_requires
skip_test_requires/,
);
- $self->log->fatal( 'updated order with success' );
+ $self->log->fatal( 'successfully updated order' );
}
if ($self->graph_deps) {
my $out = $shipwright->backend->graph_deps(
@@ -50,7 +50,7 @@ sub run {
if ( $self->update_refs ) {
$shipwright->backend->update_refs;
- $self->log->fatal( 'updated refs with success' );
+ $self->log->fatal( 'successfully updated refs' );
}
}
diff --git a/lib/Shipwright/Script/Relocate.pm b/lib/Shipwright/Script/Relocate.pm
index 9fceacc..76abc46 100644
--- a/lib/Shipwright/Script/Relocate.pm
+++ b/lib/Shipwright/Script/Relocate.pm
@@ -63,7 +63,7 @@ sub run {
}
$shipwright->backend->source($source);
- $self->log->fatal( "relocated $name to $new_source with success" );
+ $self->log->fatal( "successfully relocated $name to $new_source" );
}
}
else {
diff --git a/lib/Shipwright/Script/Rename.pm b/lib/Shipwright/Script/Rename.pm
index fe330de..3f7ad19 100644
--- a/lib/Shipwright/Script/Rename.pm
+++ b/lib/Shipwright/Script/Rename.pm
@@ -67,7 +67,7 @@ sub run {
$shipwright->backend->refs($refs);
$shipwright->backend->branches($branches) if $branches;
- $self->log->fatal( "renamed $name to $new_name with success" );
+ $self->log->fatal( "successfully renamed $name to $new_name" );
}
1;
diff --git a/lib/Shipwright/Script/Update.pm b/lib/Shipwright/Script/Update.pm
index 64a1488..d9fe964 100644
--- a/lib/Shipwright/Script/Update.pm
+++ b/lib/Shipwright/Script/Update.pm
@@ -208,7 +208,7 @@ sub run {
}
}
}
- $self->log->fatal( 'updated with success' );
+ $self->log->fatal( 'successfully updated' );
}
sub _update {
diff --git a/share/bin/shipwright-utility b/share/bin/shipwright-utility
index b9d7aae..26df3c0 100755
--- a/share/bin/shipwright-utility
+++ b/share/bin/shipwright-utility
@@ -81,7 +81,7 @@ if ( $args{'update-order'} ) {
my $order = $dep->schedule_all();
DumpFile( 'shipwright/order.yml', $order );
- print "updated order with success\n";
+ print "successfully updated order\n";
}
elsif ( $args{'generate-tar-file'} ) {
require File::Spec;
@@ -185,7 +185,7 @@ EOF
print $tar_out $_;
}
chdir $cwd;
- print "generated with success\n" unless $to eq '-';
+ print "successfully generated\n" unless $to eq '-';
}
sub fill_deps {
diff --git a/share/etc/shipwright-utility b/share/etc/shipwright-utility
index 08ace21..c05baa8 100755
--- a/share/etc/shipwright-utility
+++ b/share/etc/shipwright-utility
@@ -80,7 +80,7 @@ elsif ( defined $args{'switch'} ) {
print $fh $name;
close $fh;
- print "switched to $name with success.\n";
+ print "successfully switched to $name.\n";
}
else {
diff --git a/t/71.script_cmds.t b/t/71.script_cmds.t
index b351a13..980140b 100644
--- a/t/71.script_cmds.t
+++ b/t/71.script_cmds.t
@@ -90,7 +90,7 @@ sub start_test {
my @cmds = (
# create hello repo
- [ ['create', '-f'], qr/created with success/, "create $repo" ],
+ [ ['create', '-f'], qr/successfully created/, "create $repo" ],
# non exist cmd
[
@@ -132,7 +132,7 @@ sub start_test {
[
[ 'import', 'file:t/hello/Foo-Bar-v0.01.tar.gz', '--no-follow' ],
- qr/imported with success/,
+ qr/successfully imported/,
'import tar.gz file',
],
@@ -150,7 +150,7 @@ sub start_test {
# rename cmd
[
[ 'rename', 'Foo-Bar', 'foo' ],
- qr/renamed Foo-Bar to foo with success/
+ qr/successfully renamed Foo-Bar to foo/
],
# now Foo-Bar is renamed to foo
@@ -193,7 +193,7 @@ sub start_test {
],
# delete cmd
- [ [ 'delete', 'foo' ], qr/deleted foo with success/, 'deleted foo' ],
+ [ [ 'delete', 'foo' ], qr/successfully deleted foo/, 'deleted foo' ],
# we don't have foo dist any more
[ [ 'list', 'foo' ], qr/foo doesn't exist/, "foo is deleted" ],
@@ -201,7 +201,7 @@ sub start_test {
# import dists/dir_configure
[
[ 'import', 'dir:t/dists/dir_configure', '--version', 3.14 ],
- qr/imported with success/,
+ qr/successfully imported/,
'imported dists_dir_configure',
],
[
@@ -222,7 +222,7 @@ sub start_test {
'--version', 2.72,
'--no-follow',
],
- qr/imported with success/,
+ qr/successfully imported/,
'imported tgz_build',
],
[
@@ -238,7 +238,7 @@ sub start_test {
# import dists/tbz_make.tar.bz
[
[ 'import', 'file:t/dists/tbz_make.tar.bz2', '--no-follow' ],
- qr/imported with success/,
+ qr/successfully imported/,
'imported tbz_make',
],
[
@@ -259,27 +259,27 @@ sub start_test {
],
[
[ 'flags', 'dir_configure', '--set', 'configure,foo', ],
-qr/set flags with success\s+flags of dir_configure are configure, foo/,
- 'set flags with success',
+qr/successfully set flags\s+flags of dir_configure are configure, foo/,
+ 'successfully set flags',
],
[
[ 'flags', 'dir_configure', '--add', 'bar', ],
-qr/set flags with success\s+flags of dir_configure are bar, configure, foo/,
+qr/successfully set flags\s+flags of dir_configure are bar, configure, foo/,
'add flags to dir_configure',
],
[
[ 'flags', 'dir_configure', '--delete', 'foo,bar', ],
- qr/set flags with success\s+flags of dir_configure are configure/,
+ qr/successfully set flags\s+flags of dir_configure are configure/,
'delete flags to dir_configure',
],
[
[ 'flags', 'tgz_build', '--set', 'build' ],
- qr/set flags with success\s+flags of tgz_build are build/,
+ qr/successfully set flags\s+flags of tgz_build are build/,
'set flags to tgz_build',
],
[
[ 'flags', 'man1', '--set', 'build', '--mandatory' ],
-qr/set mandatory flags with success\s+mandatory flags of man1 are build/,
+qr/successfully set mandatory flags\s+mandatory flags of man1 are build/,
'set mandatory flag man1',
],
[
@@ -289,12 +289,12 @@ qr/set mandatory flags with success\s+mandatory flags of man1 are build/,
],
[
[ 'update', '--builder' ],
- qr/updated with success/,
+ qr/successfully updated/,
"updated builder",
],
[
[ 'update', '--utility' ],
- qr/updated with success/,
+ qr/successfully updated/,
"updated utility",
],
$^O =~ /MSWin/
@@ -314,12 +314,12 @@ qr/set mandatory flags with success\s+mandatory flags of man1 are build/,
# import an svn or svk dist named foo
[
[ 'import', $source ],
- qr/imported with success/,
+ qr/successfully imported/,
"imported $source",
],
$update_cmd, # if the source dist is svk, $update_cmd is undef
# update cmd
- [ [ 'update', 'foo' ], qr/updated with success/, "updated foo", ],
+ [ [ 'update', 'foo' ], qr/successfully updated/, "updated foo", ],
)
: (),
);
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list