Index: cwsadd.pl =================================================================== RCS file: /cvs/tools/solenv/bin/cwsadd.pl,v retrieving revision 1.4 diff -u -r1.4 cwsadd.pl --- cwsadd.pl 8 Sep 2004 11:42:41 -0000 1.4 +++ cwsadd.pl 26 Sep 2004 07:21:34 -0000 @@ -112,7 +112,7 @@ my $force_checkout = ''; my $is_debug = 0; my $opt_dir = ''; # dir option -my $vcsid = "unkown"; +my $vcsid = "unknown"; my $add_output_tree = 1; my @found_platforms = (); @@ -182,7 +182,7 @@ print "\tUpdating '$module' ...\n"; my $result = $cvs_module->update($stand_dir, $master_tag); my ($updated, $merged, $conflicts) = - $cvs_module->handle_update_infomation($result); + $cvs_module->handle_update_information($result); if ($merged || $conflicts) { push(@rejected_modules, $module); next; @@ -190,7 +190,7 @@ push(@updated_modules, $module); }; if (@rejected_modules) { - print_warning("Found conflicts and/or locallily files in the following modules:"); + print_warning("Found conflicts and/or locally files in the following modules:"); print STDERR "$_\n" foreach (@rejected_modules); print_warning("These modules will not be added to CWS. Clean up and try adding them again."); }; @@ -401,7 +401,7 @@ print_error("Cannot change to $dir!", 1); } - # assume that every valid platform on child "solver" has to be coppied + # assume that every valid platform on child "solver" has to be copied $result = opendir( SOLVER, "$cws_solver"); if ( !$result ){ print_error ("Root dir of child workspace not accessible: $!", 1) }; my @found_dirs = readdir( SOLVER ); @@ -483,7 +483,7 @@ { $result = rename("$one_module.backup.lnk", "$one_module.lnk"); } - print_error("Restoring link for $one_module failed! Cleanup is in your hand now", 1) if ( ! $result ); + print_error("Restoring link for $one_module failed! Cleanup is in your hands now", 1) if ( ! $result ); # fail for this module next; } @@ -625,7 +625,7 @@ my $message = shift; print STDERR "$script_name: "; - print STDERR "WARNING $message\n"; + print STDERR "WARNING: $message\n"; return; } Index: cwsaddtask.pl =================================================================== RCS file: /cvs/tools/solenv/bin/cwsaddtask.pl,v retrieving revision 1.3 diff -u -r1.3 cwsaddtask.pl --- cwsaddtask.pl 12 Aug 2004 15:10:14 -0000 1.3 +++ cwsaddtask.pl 26 Sep 2004 07:21:34 -0000 @@ -64,7 +64,7 @@ #************************************************************************* # -# cwsaddtask.pl - add taskids to child workspaces +# cwsaddtask.pl - add taskids (issues) to child workspaces # use strict; @@ -231,7 +231,7 @@ my $message = shift; print STDERR "$script_name: "; - print STDERR "WARNING $message\n"; + print STDERR "WARNING: $message\n"; return; } Index: cwsanalyze.pl =================================================================== RCS file: /cvs/tools/solenv/bin/cwsanalyze.pl,v retrieving revision 1.3 diff -u -r1.3 cwsanalyze.pl --- cwsanalyze.pl 12 Aug 2004 15:10:29 -0000 1.3 +++ cwsanalyze.pl 26 Sep 2004 07:21:36 -0000 @@ -108,10 +108,10 @@ print "$script_name -- version: $script_rev\n"; -#### hardcoded globals ##### +#### FIXME: hardcoded globals ##### # Don't use this tool on a MWS workspaces in the veto -# list, because the behavior my not be clearly defined +# list, because the behavior may not be clearly defined # examples: # no MWS branch exists # MWS branch is obsolete @@ -144,7 +144,7 @@ my $opt_fast = 0; # fast mode, disable conflict check my $opt_force = 0; # force integration my $opt_no_set_integrated = 0; # don't toggle integration status -my $vcsid = "unkown"; +my $vcsid = "unknown"; my @args_bak = @ARGV; #### main ##### @@ -388,7 +388,7 @@ STDOUT->autoflush(0); if ( !@{$co_ref} ) { print_error("Was not able to checkout module '$module',", 0); - print_error("this might be caused by connection failures or authentication problems.", 0); + print_error("this might be caused by connection failures or authentification problems.", 0); print_error("Please check your \$HOME/.cvspass for missing entries!", 50); } # save working dir for later perusal @@ -737,7 +737,7 @@ # find out if we need to use the '-kk' flag for merging my ($status, $working_rev, $repository_rev, $sticky_tag, $branch_rev, $sticky_date, $sticky_options) = $cvs_archive->status(); - if ( $status eq 'unkownfailure' || $status eq 'connectionfailure' ) { + if ( $status eq 'unknownfailure' || $status eq 'connectionfailure' ) { print_error("can't get status of '$file': $status", 0); return undef; } @@ -931,7 +931,7 @@ { my $message = shift; print STDERR "$script_name: "; - print STDERR "WARNING $message\n"; + print STDERR "WARNING: $message\n"; return; } Index: cwsclone.pl =================================================================== RCS file: /cvs/tools/solenv/bin/cwsclone.pl,v retrieving revision 1.2 diff -u -r1.2 cwsclone.pl --- cwsclone.pl 8 Sep 2004 11:43:01 -0000 1.2 +++ cwsclone.pl 26 Sep 2004 07:21:39 -0000 @@ -178,11 +178,11 @@ if (!-d "$stand_dir/$module/CVS") { print("\tChecking out '$module' with tag '$use_tag' ..."); $result1 = $cvs_module->checkout($stand_dir, $use_tag, ''); - output_update_infomation($result1); + output_update_information($result1); } else { print "\tUpdating '$module' to tag '$use_tag' ..."; ($result1, $result2) = $cvs_module->update($stand_dir, $use_tag, '-dPRC', 1 ); - output_update_infomation($result1, $result2); + output_update_information($result1, $result2); if($opt_prune) { prune_files($result2, $module ); } } } @@ -235,11 +235,11 @@ return 1; } -sub output_update_infomation { +sub output_update_information { my $updated_files_ref = shift; my $nonrepolist = shift; my ($updated, $merged, $conflicts, $non_repo); - if ( $updated_files_ref eq 'invaildpath' || $updated_files_ref eq 'cantchdir') { + if ( $updated_files_ref eq 'invalidpath' || $updated_files_ref eq 'cantchdir') { die('ERROR: Can\'t chdir() into module'); } else { Index: cwscreate.pl =================================================================== RCS file: /cvs/tools/solenv/bin/cwscreate.pl,v retrieving revision 1.6 diff -u -r1.6 cwscreate.pl --- cwscreate.pl 9 Sep 2004 14:48:46 -0000 1.6 +++ cwscreate.pl 26 Sep 2004 07:21:39 -0000 @@ -128,7 +128,7 @@ $umask = 22; } my $vcsid = $ENV{VCSID}; # user for logging -$vcsid = "unkown" if ( !$vcsid ); +$vcsid = "unknown" if ( !$vcsid ); # modules to be obligatory copied to each cws my %obligatory_modules = (); @@ -358,7 +358,7 @@ my $cws = shift; my $stand_dir = $ENV{SRC_ROOT}; if (!opendir(SOURCES, $stand_dir)) { - print_error ("Environment variable SRC_ROOT points to not accesible diretory: $!", 1) + print_error ("Environment variable SRC_ROOT points to not accessible diretory: $!", 1) } my @dir_content = readdir(SOURCES); close SOURCES; @@ -384,7 +384,7 @@ $cvs_module->module($module); print "\tUpdating '$module' ...\n"; my $result = $cvs_module->update($stand_dir, $master_tag); - $cvs_module->handle_update_infomation($result); + $cvs_module->handle_update_information($result); $updated_modules{$module}++; }; print $_ foreach (@warnings); @@ -567,7 +567,7 @@ } } } - # if we get here no critical error happend + # if we get here no critical error happened # return 0; # ause - disable all further steps return $success; } Index: cwsquery.pl =================================================================== RCS file: /cvs/tools/solenv/bin/cwsquery.pl,v retrieving revision 1.3 diff -u -r1.3 cwsquery.pl --- cwsquery.pl 12 Aug 2004 15:10:57 -0000 1.3 +++ cwsquery.pl 26 Sep 2004 07:21:41 -0000 @@ -266,7 +266,7 @@ { print STDERR "Usage: cwsquery [-h] [-m master] [-c child] \n"; print STDERR " cwsquery [-h] [-m master] \n"; - print STDERR "Query child workspace for miscancellous information.\n"; + print STDERR "Query child workspace for miscellaneous information.\n"; print STDERR "Modes:\n"; print STDERR "\tmodules\t\tquery modules added to the CWS\n"; print STDERR "\ttaskids\t\tquery taskids to be handled on the CWS\n"; Index: cwsresync.pl =================================================================== RCS file: /cvs/tools/solenv/bin/cwsresync.pl,v retrieving revision 1.6 diff -u -r1.6 cwsresync.pl --- cwsresync.pl 9 Sep 2004 14:48:46 -0000 1.6 +++ cwsresync.pl 26 Sep 2004 07:21:45 -0000 @@ -262,7 +262,7 @@ return ($dir, $milestone, @ARGV); } -# Parse and verify args. Check that all necessary preconditions are fullfilled +# Parse and verify args. Check that all necessary preconditions are fulfilled # and fill the action_list sub parse_args { @@ -358,7 +358,7 @@ } if ( $error ) { print_error("Please run '$script_name -m' either in an empty scratch directory,", 0); - print_error("or in a diretory containing all specified modules,", 0); + print_error("or in a directory containing all specified modules,", 0); print_error("or, if inside a module,", 0); print_error("make certain that all specified files/directories exist.", 2); } @@ -478,7 +478,7 @@ STDOUT->autoflush(0); if ( !@{$co_ref} ) { print_error("Was not able to checkout module '$module',", 0); - print_error("this might be caused by connection failures or authentication problems. That also can be caused by cvs mirror. If you recently added this module, please wait for your mirror server to syncronize", 0); + print_error("this might be caused by connection failures or authentification problems. That also can be caused by cvs mirror. If you recently added this module, please wait for your mirror server to syncronize", 0); print_error("Please check your \$HOME/.cvspass for missing entries!", 50); } @@ -790,7 +790,7 @@ print_warning("... Unknown module. Skipping..."); next; }; - $cvs_module->handle_update_infomation($result); + $cvs_module->handle_update_information($result); }; register_cws_milestone($cws, $new_master, $milestone); return; @@ -849,7 +849,7 @@ print_message("Doing some checks ..."); - # hack to get the mileston :-((((( + # hack to get the milestone :-((((( if ( ! defined($cws->milestone())) { $cws->milestone($ENV{UPDMINOR});# = $ENV{UPDMINOR}; @@ -980,7 +980,7 @@ my $btarget = "finalize"; foreach my $platform ( @found_platforms ) { - # don't copy tree that was already successfull + # don't copy tree that was already successful next if ( -f "$sourceroot/$cws_master/$platform/inc.$milestone/$platform_resynced_flag" ); %sync_dir::done_hash = (); print "Create copy of solver for $platform ( ~ 1GB disk space needed !)\n"; @@ -1241,7 +1241,7 @@ print "removed in CWS, but changes in MWS are pending. Please check!.\n"; return 'alert'; } - if ( $status eq 'unkownfailure' ) { + if ( $status eq 'unknownfailure' ) { print_error("can't get status of '$file': $status", 0); return 'failure'; } @@ -1356,7 +1356,7 @@ } else { # can't happen - print_error("internal_error commit_file(): unkown type: $type", 0); + print_error("internal_error commit_file(): unknown type: $type", 0); } # prepare commit comment @@ -1728,7 +1728,7 @@ my $message = shift; print STDERR "$script_name: "; - print STDERR "WARNING $message\n"; + print STDERR "WARNING: $message\n"; return; } Index: setsolar.pl =================================================================== RCS file: /cvs/tools/solenv/bin/setsolar.pl,v retrieving revision 1.19 diff -u -r1.19 setsolar.pl --- setsolar.pl 8 Apr 2004 15:42:07 -0000 1.19 +++ setsolar.pl 26 Sep 2004 07:21:47 -0000 @@ -287,7 +287,7 @@ if ( open(LOG_PRODUCT, ">>$log") ) { my ($sec, $min, $hour, $mday, $mon, $year) = localtime(time()); $year = substr($year,1); - my $login_name = getlogin() || getpwuid($<) || "unkown"; + my $login_name = getlogin() || getpwuid($<) || "unknown"; $format_login_name = "$login_name"; $format_date .= sprintf('%02d.%02d.%02d-%02d:%02d:%02d', $mday, $mon+1, $year, $hour, $min, $sec); @@ -555,7 +555,7 @@ if ( open(LOG_WORKSTAMP, ">>$log") ){ my ($sec, $min, $hour, $mday, $mon, $year) = localtime(time()); $year = substr($year,1); - my $login_name = getlogin() || getpwuid($<) || "unkown"; + my $login_name = getlogin() || getpwuid($<) || "unknown"; $format_login_name = "$login_name"; $format_platform = "$platform"; $format_platform .= defined($env_settings{'PROEXT'}) ? $env_settings{'PROEXT'} : ""; Index: modules/Cvs.pm =================================================================== RCS file: /cvs/tools/solenv/bin/modules/Cvs.pm,v retrieving revision 1.17 diff -u -r1.17 Cvs.pm --- modules/Cvs.pm 27 Jul 2004 13:01:40 -0000 1.17 +++ modules/Cvs.pm 26 Sep 2004 07:21:50 -0000 @@ -70,7 +70,7 @@ use CwsConfig; -##### ctor #### +##### constructor #### sub new { @@ -269,7 +269,7 @@ return 0; } -# Update archive with options $options .Returns 'success' and new revision +# Update archive with options $options. Returns 'success' and new revision # on success or reason of failure. If no update happens because file was # up-to-date consider operation a success. sub update @@ -288,7 +288,7 @@ /\[update aborted\]: connect to/ && ++$connectionfailure; } if ( $conflict || $notknown || $connectionfailure) { - my $failure = 'unkownfailure'; + my $failure = 'unknownfailure'; $failure = 'conflict' if $conflict; $failure = 'notknown' if $notknown; $failure = 'connectionfailure' if $connectionfailure; @@ -325,7 +325,7 @@ /\[commit aborted\]: connect to/ && ++$connectionfailure; } if ( !$success ) { - my $failure = 'unkownfailure'; + my $failure = 'unknownfailure'; $failure = 'conflict' if $conflict; $failure = 'notuptodate' if $uptodate; $failure = 'notknown' if $notknown; @@ -386,7 +386,7 @@ return 'connectionfailure' if $connectionfailure; return 'invalidfile' if $invalidfile; # should never happen - return 'unkownfailure'; + return 'unknownfailure'; } #### misc operations #### @@ -400,7 +400,7 @@ my $self = shift; my $file = $self->name(); - my ($nofile, $unkownfailure, $connectionfailure); + my ($nofile, $unknownfailure, $connectionfailure); my ($status, $working_rev, $repository_rev); my ($sticky_tag, $branch, $sticky_date, $sticky_options); @@ -436,9 +436,9 @@ $sticky_options = $1; } - $unkownfailure++ if !$status; + $unknownfailure++ if !$status; - return 'unkownerror' if $unkownfailure; + return 'unknownerror' if $unknownfailure; return ($status, $working_rev, $repository_rev, $sticky_tag, $branch, $sticky_date, $sticky_options); } @@ -452,19 +452,19 @@ my $options = shift || ''; my $file = $self->name(); - my ($nofile, $unkowntagfailure, $unkownrevfailure, $connectionfailure); + my ($nofile, $unknowntagfailure, $unknownrevfailure, $connectionfailure); my $response_ref = $self->execute("diff $options -r$rev1 -r$rev2 $file"); foreach ( @{$response_ref} ){ /\[diff aborted\]: connect to/ && ++$connectionfailure; - /cvs \[server aborted\]: no such tag \w+/ && ++$unkowntagfailure; - /cvs server: tag [\d\.]+ is not in file $file/ && ++$unkownrevfailure; + /cvs \[server aborted\]: no such tag \w+/ && ++$unknowntagfailure; + /cvs server: tag [\d\.]+ is not in file $file/ && ++$unknownrevfailure; } return 'connectionfailure' if $connectionfailure; - return 'unkowntagfailiure' if $unkowntagfailure; - return 'unkownrevfailiure' if $unkownrevfailure; + return 'unknowntagfailure' if $unknowntagfailure; + return 'unknownrevfailure' if $unknownrevfailure; return wantarray ? @{$response_ref} : $response_ref; } #### private methods #### Index: modules/CvsModule.pm =================================================================== RCS file: /cvs/tools/solenv/bin/modules/CvsModule.pm,v retrieving revision 1.5 diff -u -r1.5 CvsModule.pm --- modules/CvsModule.pm 8 Sep 2004 11:43:12 -0000 1.5 +++ modules/CvsModule.pm 26 Sep 2004 07:21:50 -0000 @@ -86,7 +86,7 @@ VCSID => $config->get_cvs_server_id() # VCSID of CVS user ); -##### ctor #### +##### constructor #### sub new { @@ -97,7 +97,7 @@ $self->{VERBOSE} = 0; # verbose diagnostics $self->{CVS_SERVER} = undef; # name of CVS server $self->{CVS_METHOD} = undef; # checkout method - $self->{CVS_REPOSITORY} = undef; # CVS reposiory + $self->{CVS_REPOSITORY} = undef; # CVS repository $self->{DEFS_CACHE} = undef; # cache for module definitions bless ($self, $class); return $self; @@ -148,10 +148,10 @@ # this procedure provides common output # the result of update method # -sub handle_update_infomation { +sub handle_update_information { my ($self, $updated_files_ref) = @_; my ($updated, $merged, $conflicts); - if ( $updated_files_ref eq 'invaildpath' || $updated_files_ref eq 'cantchdir') { + if ( $updated_files_ref eq 'invalidpath' || $updated_files_ref eq 'cantchdir') { die('ERROR: Can\'t chdir() into module'. $self->module()); } else { @@ -754,7 +754,7 @@ print STDERR "\nThe cvs rdiff command is broken for the OOo CVS server.\n"; print STDERR "To fix this problem you have to issue the following cvs login command:\n\n"; print STDERR " cvs -d $root login\n\n"; - print STDERR "The password is your ususal OOo password.\n\n"; + print STDERR "The password is your usual OOo password.\n\n"; exit(1); } }