Re: spelling errors in GRAB
Greg Kurtzer <[email protected]> Sun, 7 Apr 2002 21:08:16 -0700
| Newsgroups | gmane.linux.redhat.rpm.grab |
|---|---|
| Message-ID | <[email protected]> |
I have applied the patch, and I thank you for the spelling updates. You are the first to send in a patch like this. I guess that all of the other people that are comfortable looking at source code are as bad at spelling as I am, or just don't care. In any case, I am very thankful for your patch, and you can consider yourself credited: line 205 (Version >= 0.2.32): # - Kimiko Koopman <[email protected]> Thanks again! Greg On Sun, Apr 07, 2002 at 01:44:49PM +0200, Kimiko Koopman wrote: > Hi there. > > Re. the recent post about 'caught' misspelled as 'cought', here are a few > more annoying pelling errors corrected (attached context diff of 0.2.31-1). > > Kimiko Koopman > *** /usr/bin/grab Fri Apr 5 09:53:07 2002 > --- /tmp/grab Sun Apr 7 13:40:15 2002 > *************** > *** 56,60 **** > # tab/space bug in conf file, and update count bug (off > # by +1). > ! # v0.2.4 Removed the dependancy wget (wget does not work well behind > # firewalls) and use lynx insead. Modified the conf file > # slightly to be more user friendly. Added ability to install > --- 56,60 ---- > # tab/space bug in conf file, and update count bug (off > # by +1). > ! # v0.2.4 Removed the dependency wget (wget does not work well behind > # firewalls) and use lynx insead. Modified the conf file > # slightly to be more user friendly. Added ability to install > *************** > *** 90,94 **** > # v0.2.9 Fixed bug in the RPM Find sub with regard to servername, and > # added recognition in chooser for 'a' to match 'all'. Fixed > ! # bug in dependancy checking. Added download meter shell script > # v0.2.10 Fixed minor bug in spawned shell script (during download). > # v0.2.11 Added final slash check during update. Added feature check for > --- 90,94 ---- > # v0.2.9 Fixed bug in the RPM Find sub with regard to servername, and > # added recognition in chooser for 'a' to match 'all'. Fixed > ! # bug in dependency checking. Added download meter shell script > # v0.2.10 Fixed minor bug in spawned shell script (during download). > # v0.2.11 Added final slash check during update. Added feature check for > *************** > *** 100,104 **** > # v0.2.12 Cleaned the code, made it more 'perl -w' friendly, and began > # optimizing. Fixed bug with regard to the auto chooser when it > ! # finds only one possiability (why have the user choose?). Added > # --getdevel function, and --chooser. fixed bug in the spawned > # shell download meter. Fixed bug in "all" download option. > --- 100,104 ---- > # v0.2.12 Cleaned the code, made it more 'perl -w' friendly, and began > # optimizing. Fixed bug with regard to the auto chooser when it > ! # finds only one possibility (why have the user choose?). Added > # --getdevel function, and --chooser. fixed bug in the spawned > # shell download meter. Fixed bug in "all" download option. > *************** > *** 113,121 **** > # specific archs (i.e. kernel, and glibc). Fixed how the auto > # display features work when only found one pacakge. Fixed some > ! # dependancy checking, so it actually finds deps now! Also added > # verbose file dumping when RPM errors out. > # v0.2.16 Fixed download only bug with autochooser. Added the provides > # feature, and the upgrade feature. Fixed yet another issue with > ! # the dependancy checking (actually multiple issues). Fixed a bug > # regarding using regular expression characters as a package name. > # Added the description option for only checking certain RPM > --- 113,121 ---- > # specific archs (i.e. kernel, and glibc). Fixed how the auto > # display features work when only found one pacakge. Fixed some > ! # dependency checking, so it actually finds deps now! Also added > # verbose file dumping when RPM errors out. > # v0.2.16 Fixed download only bug with autochooser. Added the provides > # feature, and the upgrade feature. Fixed yet another issue with > ! # the dependency checking (actually multiple issues). Fixed a bug > # regarding using regular expression characters as a package name. > # Added the description option for only checking certain RPM > *************** > *** 321,330 **** > # Some very basic signal handlers > $SIG{ALRM} = sub { > ! warn "\n-Cought Timeout Interrupt, exiting...\n"; > warn "-Maybe try a `rpm --rebuilddb`?\n"; > exit 1; > }; > $SIG{INT} = sub { > ! warn "\n-Cought Signal Interrupt, exiting...\n"; > exit 1; > }; > --- 321,330 ---- > # Some very basic signal handlers > $SIG{ALRM} = sub { > ! warn "\n-Caught Timeout Interrupt, exiting...\n"; > warn "-Maybe try a `rpm --rebuilddb`?\n"; > exit 1; > }; > $SIG{INT} = sub { > ! warn "\n-Caught Signal Interrupt, exiting...\n"; > exit 1; > }; > *************** > *** 382,386 **** > -E, --expand Display emphasis on packages in chooser > -P, --print Print matched RPM list and exit > ! -Q, --quiet Display as little as possiable > -v, --verbose Verbose output > --debug Display very verbose debugging info > --- 382,386 ---- > -E, --expand Display emphasis on packages in chooser > -P, --print Print matched RPM list and exit > ! -Q, --quiet Display as little as possible > -v, --verbose Verbose output > --debug Display very verbose debugging info > *************** > *** 577,581 **** > } > > ! # Create the config directory if it does not exsist > if ( ! -d $config_dir ) { > warn "-Creating config directory \"$config_dir\"...\n"; > --- 577,581 ---- > } > > ! # Create the config directory if it does not exist > if ( ! -d $config_dir ) { > warn "-Creating config directory \"$config_dir\"...\n"; > *************** > *** 585,589 **** > } > > ! # Write a server config file if it does not exsist > if ( ! -f "$config_dir/$server_config_file" ) { > warn "-Creating Server config file \"$config_dir/$server_config_file\"\n"; > --- 585,589 ---- > } > > ! # Write a server config file if it does not exist > if ( ! -f "$config_dir/$server_config_file" ) { > warn "-Creating Server config file \"$config_dir/$server_config_file\"\n"; > *************** > *** 594,598 **** > } > > ! # Write a defaults config file if it does not exsist > if ( ! -f "$config_dir/$defaults_config_file" ) { > warn "-Creating Defaults config file \"$config_dir/$defaults_config_file\"\n"; > --- 594,598 ---- > } > > ! # Write a defaults config file if it does not exist > if ( ! -f "$config_dir/$defaults_config_file" ) { > warn "-Creating Defaults config file \"$config_dir/$defaults_config_file\"\n"; > *************** > *** 603,607 **** > } > > ! # Write a general config file if it does not exsist > if ( ! -f "$config_dir/$config_file" ) { > warn "-Creating General config file \"$config_dir/$config_file\"\n"; > --- 603,607 ---- > } > > ! # Write a general config file if it does not exist > if ( ! -f "$config_dir/$config_file" ) { > warn "-Creating General config file \"$config_dir/$config_file\"\n"; > *************** > *** 612,616 **** > } > > ! # If config directory did not exsist print banner and exit > if ( $first_run ) { > warn "$disclosure\n"; > --- 612,616 ---- > } > > ! # If config directory did not exist print banner and exit > if ( $first_run ) { > warn "$disclosure\n"; > *************** > *** 904,908 **** > } > if ( $bad_opt ) { > ! warn "I Did not undertand option(s) $bad_opt!\n"; > warn " To view help use the '--help' option.\n"; > exit (1); > --- 904,908 ---- > } > if ( $bad_opt ) { > ! warn "I Did not understand option(s) $bad_opt!\n"; > warn " To view help use the '--help' option.\n"; > exit (1); > *************** > *** 1202,1206 **** > $ftp->cwd("$path") or die "PANIC: Could not chdir to $path on $host!\n"; > $ftp->ascii(); > ! $ftp->get($file, "$cache_dir/$file") or die "PANIC: Could not retrive file\n"; > $ftp->close; > open(SRVRS, "$cache_dir/$file"); > --- 1202,1206 ---- > $ftp->cwd("$path") or die "PANIC: Could not chdir to $path on $host!\n"; > $ftp->ascii(); > ! $ftp->get($file, "$cache_dir/$file") or die "PANIC: Could not retrieve file\n"; > $ftp->close; > open(SRVRS, "$cache_dir/$file"); > *************** > *** 1823,1827 **** > if ( $live_found == '1000' && ! $disp_expand ) { > printf ("\r-Comparing RPMS... %3d% (%d/%d) => Found: %d \n", $percent, $live_count, $total_matched_rpm_count, $live_found) unless $quiet; > ! print "-More then 1000 matches were found!\n"; > print "-Refine your search and try again or use the '--expand' argument\n"; > exit 1; > --- 1823,1827 ---- > if ( $live_found == '1000' && ! $disp_expand ) { > printf ("\r-Comparing RPMS... %3d% (%d/%d) => Found: %d \n", $percent, $live_count, $total_matched_rpm_count, $live_found) unless $quiet; > ! print "-More than 1000 matches were found!\n"; > print "-Refine your search and try again or use the '--expand' argument\n"; > exit 1; > *************** > *** 2194,2198 **** > > next if ( defined $skippage ); > ! print "-Grabbing $packages{$line} from \"$descriptions{$line}\" ( Package $count of $number_rpms )\n" unless $quiet; > > if ( ! $wgets ) { > --- 2194,2198 ---- > > next if ( defined $skippage ); > ! print "-Grabbing $packages{$line} from '$descriptions{$line}' ( Package $count of $number_rpms )\n" unless $quiet; > > if ( ! $wgets ) { > *************** > *** 2282,2286 **** > } else { > rename("$rpm_repository$line.incomplete", "$rpm_repository$line.died"); > ! print "\n-File download died unexpetedly...!\n"; > exit 1; > } > --- 2282,2286 ---- > } else { > rename("$rpm_repository$line.incomplete", "$rpm_repository$line.died"); > ! print "\n-File download died unexpectedly...!\n"; > exit 1; > } > *************** > *** 2415,2419 **** > if ( $for_rpm_u && ! $instu_ok ) { > if ( $tester ) { > ! print "-Calling 'rpm -U --test' for '$number' package(s)...\n"; > } else { > print "-Calling 'rpm -U' for '$number' package(s)...\n"; > --- 2415,2419 ---- > if ( $for_rpm_u && ! $instu_ok ) { > if ( $tester ) { > ! print "-Calling 'rpm -U --test' for $number package(s)...\n"; > } else { > print "-Calling 'rpm -U' for '$number' package(s)...\n"; > *************** > *** 2472,2476 **** > #last; > } elsif ( $err =~ /require not satisfied/ ) { > ! # Dependancy problems exsist! rebuild @inst in case we should find the deps > $err =~ s/^\W+//g; > @deps = split(/: /, $err ); > --- 2472,2476 ---- > #last; > } elsif ( $err =~ /require not satisfied/ ) { > ! # Dependency problems exist! rebuild @inst in case we should find the deps > $err =~ s/^\W+//g; > @deps = split(/: /, $err ); > *************** > *** 2524,2534 **** > # Prompt user for dep resolution > if ( $verbose ) { > ! print "-Dependency conflict(s) exsists:\n$deperr"; > } else { > print "-Dependencies found:\n$deperr"; > } > ! print LOGFILE "-Dependancy conflict(s) exsists:\n$deperr\n\n" if ( $cron ); > if ( $quiet || $cron ) { > ! print "-Please resolve Dependancy problems manually!"; > exit 1; > } > --- 2524,2534 ---- > # Prompt user for dep resolution > if ( $verbose ) { > ! print "-Dependency conflict(s) exists:\n$deperr"; > } else { > print "-Dependencies found:\n$deperr"; > } > ! print LOGFILE "-Dependency conflict(s) exists:\n$deperr\n\n" if ( $cron ); > if ( $quiet || $cron ) { > ! print "-Please resolve Dependency problems manually!"; > exit 1; > } > *************** > *** 2578,2583 **** > $debug and print "*)DEBUG: verifying $rpmverify...\n"; > open(VERIFY, "rpm --verify $packages{$rpmverify}-$versions{$rpmverify}-$builds{$rpmverify} 2>&1 &&\ > ! echo \":^) '$packages{$rpmverify}'... Installation Sucessful!\" ||\ > ! echo \":^o '$packages{$rpmverify}'... Possiable error? (Check manually)\" |"); > @verify = <VERIFY>; > foreach (reverse @verify) {; > --- 2578,2583 ---- > $debug and print "*)DEBUG: verifying $rpmverify...\n"; > open(VERIFY, "rpm --verify $packages{$rpmverify}-$versions{$rpmverify}-$builds{$rpmverify} 2>&1 &&\ > ! echo \"^_^ '$packages{$rpmverify}'... Installation Sucessful!\" ||\ > ! echo \"'o' '$packages{$rpmverify}'... Possible error? (Check manually)\" |"); > @verify = <VERIFY>; > foreach (reverse @verify) {; > *************** > *** 2598,2602 **** > > sub db_open { > ! # desc: check for the exsistance of databases, and then open them > # params: none > # return: %packages, %versions, %builds, %archs, %locations, %sizes, > --- 2598,2602 ---- > > sub db_open { > ! # desc: check for the existance of databases, and then open them > # params: none > # return: %packages, %versions, %builds, %archs, %locations, %sizes, > *************** > *** 2723,2727 **** > > my $dep_loc = (); > ! print "-Where do you want to search for the dependancies?\n"; > print " 1) Defined FTP Servers\n"; > print " 2) RPMFIND repositories\n"; > --- 2723,2727 ---- > > my $dep_loc = (); > ! print "-Where do you want to search for the dependencies?\n"; > print " 1) Defined FTP Servers\n"; > print " 2) RPMFIND repositories\n"; > *************** > *** 2867,2871 **** > $ftp->cwd("$devel_path") or die "-PANIC: Could not chdir to $devel_path on $devel_host!\n"; > $ftp->ascii(); > ! $ftp->get($devel_file) or die "-PANIC: Could not retrive file\n"; > $ftp->close; > > --- 2867,2871 ---- > $ftp->cwd("$devel_path") or die "-PANIC: Could not chdir to $devel_path on $devel_host!\n"; > $ftp->ascii(); > ! $ftp->get($devel_file) or die "-PANIC: Could not retrieve file\n"; > $ftp->close; > > *************** > *** 2941,2945 **** > > if ( $file ) { > ! print "-$file already exsists!\n"; > print "-Please move it and try again\n"; > exit 1; > --- 2941,2945 ---- > > if ( $file ) { > ! print "-$file already exists!\n"; > print "-Please move it and try again\n"; > exit 1; > *************** > *** 3123,3127 **** > } > if ( ! $found_dep && @dep_found ) { > ! print "-Could not find all dependancies!\n"; > exit 1; > } > --- 3123,3127 ---- > } > if ( ! $found_dep && @dep_found ) { > ! print "-Could not find all dependencies!\n"; > exit 1; > } > *************** > *** 3290,3294 **** > } > if ( ! $found_dep && @dep_found ) { > ! print "-Could not find all dependancies!\n"; > exit 1; > } > --- 3290,3294 ---- > } > if ( ! $found_dep && @dep_found ) { > ! print "-Could not find all dependencies!\n"; > exit 1; > } -- Greg Kurtzer [email protected] http://www.runlevelzero.net LINUX,... The choice of a GNU generation! :wq