summaryrefslogtreecommitdiffstats
path: root/tools/syncrpms
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-07-25 09:06:35 +0000
committerFrancois Pons <fpons@mandriva.com>2001-07-25 09:06:35 +0000
commite00f0405faf8edc53fcae09888e45a87f86b01a9 (patch)
tree32154cd20461d63e0a83d62628035f6ea1021806 /tools/syncrpms
parentee0a30f1cc747b64d28731c07253d9eb04c0e028 (diff)
downloaddrakx-e00f0405faf8edc53fcae09888e45a87f86b01a9.tar
drakx-e00f0405faf8edc53fcae09888e45a87f86b01a9.tar.gz
drakx-e00f0405faf8edc53fcae09888e45a87f86b01a9.tar.bz2
drakx-e00f0405faf8edc53fcae09888e45a87f86b01a9.tar.xz
drakx-e00f0405faf8edc53fcae09888e45a87f86b01a9.zip
fixed still missing rpmtools:: before a version_compare ...
Diffstat (limited to 'tools/syncrpms')
-rwxr-xr-xtools/syncrpms2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/syncrpms b/tools/syncrpms
index 891474b8b..946032e52 100755
--- a/tools/syncrpms
+++ b/tools/syncrpms
@@ -62,7 +62,7 @@ sub get_rpms {
my $key = "$1 $4"; #- get name including architecture.
if ($rpms->{$key}) {
if (rpmtools::version_compare($2, $rpms->{$key}{version}) > 0 ||
- rpmtools::version_compare($2, $rpms->{$key}{version}) == 0 && version_compare($3, $rpms->{$key}{release}) > 0) {
+ rpmtools::version_compare($2, $rpms->{$key}{version}) == 0 && rpmtools::version_compare($3, $rpms->{$key}{release}) > 0) {
if ($modifiable) {
if ($flag->{sorted}) {
print "you said rpms directory are sorted, so I keep obseleted $rpms->{$key}{file} by $_ in $rpms->{$key}{dir}\n" if $flag->{verbose};
ass="hl opt">($o->{interactiveSteps}); push @{$o->{interactiveSteps}}, qw(installPackages exitInstall configureNetwork), @graphical_steps; if ($o->{interactive}) { my $interactiveClass = "install_steps_$o->{interactive}"; require "$interactiveClass.pm"; @ISA = ($interactiveClass, @ISA); foreach my $f (@{$o->{orderedSteps}}) { my $auto_name = member($f, @{$o->{interactiveSteps}}) ? 'noauto' : 'auto'; $o->{steps}{$f}{$auto_name} = 1; } goto &{$::{$interactiveClass . "::"}{new}}; } else { @ISA = ('install_steps_auto_install_non_interactive', @ISA); (bless {}, ref($type) || $type)->install_steps::new($o); } } sub configureNetwork { my ($o) = @_; log::l("install_steps_auto_install::configureNetwork"); modules::load_category($o->{modules_conf}, 'network/main|gigabit|usb'); goto &install_steps::configureNetwork; } sub exitInstall { my ($o, $alldone) = @_; return if $o->{autoExitInstall}; if ($o->{interactive}) { $o->SUPER::exitInstall($alldone); } else { install_steps::exitInstall($o); print "\a"; print "Auto installation complete (the postInstall is not done yet though)\n"; print "Press <Enter> to reboot\n"; <STDIN>; } } #-###################################################################################### #- install_steps_auto_install_non_interactive package #-###################################################################################### package install_steps_auto_install_non_interactive; use install_steps; use lang; use modules; use common; use log; sub enteringStep { my ($o, $step) = @_; my ($s, $t) = (N_("Entering step `%s'\n"), $o->{steps}{$step}{text}); ($s, $t) = (translate($s), translate($t)) if $ENV{LANG} !~ /ja|ko|zh/; print sprintf($s, $t); $o->install_steps::enteringStep($step); } sub rebootNeeded { my ($_o) = @_; print "\nWhile partitioning, the partition table re-read failed, needing a reboot\n"; print "This is plain wrong for an auto_install\n"; errorInStep(); } sub ask_warn { log::l(ref($_[1]) ? join " ", @{$_[1]} : $_[1]); } sub wait_message { my ($_o, $_title, $_message) = @_; } sub charsetChanged { my ($o) = @_; lang::load_console_font($o->{locale}); } sub errorInStep { my ($_o, $err) = @_; print "error :(\n"; print "$err\n\n"; print "switch to console f2 for a shell\n"; print "Press <Enter> to reboot\n"; <STDIN>; c::_exit(0); } #-###################################################################################### #- Steps Functions #-###################################################################################### sub installPackages { my ($o, $packages) = @_; catch_cdie { $o->install_steps::installPackages($packages) } sub { print formatError($@), "\n"; 1 } } 1;