- we need transaction in mnf to access mnf var, let's mv that to

  mdkonline-update.pl in mnf backend script.

1 files changed, 1 insertions, 4 deletions

diff --git a/mdkupdate b/mdkupdate
index 7b45d1f2..a1f25c2a 100755
--- a/mdkupdate
+++ b/mdkupdate
@@ -96,9 +96,6 @@ if ($o{LOGIN} && $o{PASS} && $o{LOGIN} !~ /\s+/ && $o{PASS} !~ /\s+/) {
 			  $noscheduled = join(',', @{$c2h->{nosched}}); $noscheduled =~ s/\.rpm//g;
 			  #printf "SCHEDULED = $scheduled\nNOSCHEDULED = $noscheduled\n";
 			  -f $currentrpm or rpm_qa($currentrpm);
-			  if ($opt eq '--mnf') {
-			      install_mnf_pkgs();
-			  }
 			  if ($opt eq '--applet') {
 			      system "/usr/bin/MandrakeUpdate", "--no-confirmation", "--media=update_source", "--pkg-sel=$scheduled", "--pkg-nosel=$noscheduled"
 			  } elsif ($opt eq '--auto') {
@@ -107,7 +104,7 @@ if ($o{LOGIN} && $o{PASS} && $o{LOGIN} !~ /\s+/ && $o{PASS} !~ /\s+/) {
 			  rpm_qa($afterrpm);
 			  my %new = getVarsFromSh($conffile);
 			  my $need_upload = get_rpm_diff();
-			  if ($need_upload || $opt eq '--auto') {
+			  if ($need_upload || member($opt, qw(--auto --mnf))) {
 			      #- send configuration and get back key to use...
 			      my $r;
 			      ($r, $new{CURRENTKEY}) = send_conf_update($new{LOGIN}, $new{PASS}, $new{MACHINE});