and some more stuff..

Kimiko Koopman <[email protected]> Tue, 21 May 2002 21:19:49 +0200

Newsgroups	gmane.linux.redhat.rpm.grab
Message-ID	<20020521191948.GB4421@brokenmoon>

Hi there.

Me again with some more comments:
- rpm doesn't know the options --nopgp and --nogpg, which causes the
  validation part to fail.
- And because I already fixed some of the things I mentioned, here's
  a patch (attached). I hope I did the auto_remove thing right. Perl
  is not my first language.

Kimiko Koopman

grab.patch (text/plain, 4.3 KB)

*** /home/kimiko/grab.txt	2002-05-21 21:16:36.000000000 +0200
--- /usr/bin/grab	2002-05-21 21:11:49.000000000 +0200
***************
*** 198,202 ****
  #     functions. Rebuilt the filter statistics display. Lots of smaller 
  #     changes as well (to many to list). Oh yea, added %bad_deps to handle
! #     packages with dependancy problems.
  #
  # TODO:
--- 198,202 ----
  #     functions. Rebuilt the filter statistics display. Lots of smaller 
  #     changes as well (to many to list). Oh yea, added %bad_deps to handle
! #     packages with dependency problems.
  #
  # TODO:
***************
*** 274,278 ****
  %cur_package, %cur_version, %cur_build, %cur_arch, %provides);
  
! # Declaring Variables for all possiable arguments
  my ($debug, $arg_update, $arg_clean, $arg_tester, $arg_match, $arg_search, 
  $arg_sysupdate, $arg_version, $arg_download, $arg_verbose, $arg_redownload,
--- 274,278 ----
  %cur_package, %cur_version, %cur_build, %cur_arch, %provides);
  
! # Declaring Variables for all possible arguments
  my ($debug, $arg_update, $arg_clean, $arg_tester, $arg_match, $arg_search, 
  $arg_sysupdate, $arg_version, $arg_download, $arg_verbose, $arg_redownload,
***************
*** 292,301 ****
  # This is where you list the _broken_ packages. Format is:
  #
! #   'dependancy'   => { pkg => 'package', force => '1/0'},
! #  (pkg == the name of the package that provides 'dependancy')
  #  (force == force this link even if dep resolves normally)
  #
  # Not using the force option simply gives GRAB a hint as to what package
! # provides what dependancy. Using the force option will overide what GRAB
  # thinks may be right.
  #
--- 292,301 ----
  # This is where you list the _broken_ packages. Format is:
  #
! #   'dependency'   => { pkg => 'package', force => '1/0'},
! #  (pkg == the name of the package that provides 'dependency')
  #  (force == force this link even if dep resolves normally)
  #
  # Not using the force option simply gives GRAB a hint as to what package
! # provides what dependency. Using the force option will overide what GRAB
  # thinks may be right.
  #
***************
*** 2357,2361 ****
        $done{$_} = '1';
     }
!    print "-Searching for unresolved dependancies\n" unless $arg_quiet;
     $debug and warn "Attempting to resolve dependencies\n";
     while ( 1 ) {
--- 2357,2361 ----
        $done{$_} = '1';
     }
!    print "-Searching for unresolved dependencies\n" unless $arg_quiet;
     $debug and warn "Attempting to resolve dependencies\n";
     while ( 1 ) {
***************
*** 2438,2443 ****
     }
     if (@return) {
!       print "-Dependancies were found! Sending you back to the package chooser.\n" unless $arg_quiet;
!       $debug and warn "-Dependancies were found! Sending you back to the package chooser.\n";
     }
     return(@return);
--- 2438,2443 ----
     }
     if (@return) {
!       print "-Dependencies were found! Sending you back to the package chooser.\n" unless $arg_quiet;
!       $debug and warn "-Dependencies were found! Sending you back to the package chooser.\n";
     }
     return(@return);
***************
*** 2597,2601 ****
           chomp $line;
           $debug and warn "Running rpm --checksig on $rpm_repository; $line\n" ;
!          chomp ($out = `cd $rpm_repository; $bin_rpm --checksig --nopgp --nogpg $line`);
           if ( $? != '0' ) {
              print " -> ERROR: $out\n";
--- 2597,2601 ----
           chomp $line;
           $debug and warn "Running rpm --checksig on $rpm_repository; $line\n" ;
!          chomp ($out = `cd $rpm_repository; $bin_rpm --checksig $line`);
           if ( $? != '0' ) {
              print " -> ERROR: $out\n";
***************
*** 2930,2938 ****
     my @remove = @_;
     $debug and warn "Starting autoremove sub\n";
!    if ( @remove ) {
!       print "-Removing installed/upgraded RPM file(s)\n";
!       foreach ( @remove ) {
!          $debug and warn " unlinking $rpm_repository/$_\n";
!          unlink("$rpm_repository/$_");
        }
     }
--- 2930,2940 ----
     my @remove = @_;
     $debug and warn "Starting autoremove sub\n";
!    if ( $cfg_autoremove ) {
!       if ( @remove ) {
!          print "-Removing installed/upgraded RPM file(s)\n";
!          foreach ( @remove ) {
!             $debug and warn " unlinking $rpm_repository/$_\n";
!             unlink("$rpm_repository/$_");
!          }
        }
     }