From fbd1bc07905a126deae4c7e66e33f22e3703c7ac Mon Sep 17 00:00:00 2001
From: Daouda Lo <daouda@mandriva.com>
Date: Tue, 28 May 2002 14:05:15 +0000
Subject: - clean up - fix

---
 mdkupdate | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'mdkupdate')

diff --git a/mdkupdate b/mdkupdate
index 5706f9b3..f2eff520 100755
--- a/mdkupdate
+++ b/mdkupdate
@@ -41,7 +41,7 @@ sub _ {
 $logfile = "/var/log/mdkupdate.log";
 my $url_upload_diff = "https://www.mandrakeonline.net/online_dif.php";
 my $url_get_rpms = "https://www.mandrakeonline.net/online_update.php";
-my $rpms_rep = "/var/cache/urpmi/rpms/";
+my $rpms_rep = "/root/tmp/";
 my $VERSION = "0.16";
 my $security = 0;
 
@@ -104,8 +104,7 @@ sub update_rpms () {
 	    my @junk= splice(@str_m,0,3);
 	    my $mir_full = "ftp://" . $l{MIRROR} . "/" . $l{VER} ."/" . "RPMS"."/";
 	    update_packages($mir_full,@str_m);
-
-	} else { print "problem occur $str_m\n";}
+	} else { log_it("problem occur $str_m\n");}
 	    	    
     } else {
 	log_it(_("Your login or password may be wrong")."\n"._("You'll need to have an account on MandrakeOnline, or update your subscription")."\n"._("For any problem send mail to support\@mandrakeonline.net\n"));
@@ -116,7 +115,7 @@ sub update_rpms () {
 
 sub update_packages {
     my ($mir,@str) = @_;
-    chdir ($rpms_rep);
+    chdir($rpms_rep) or log_it("\ncannot chdir to $rpms_rep\n");
     $full_rpm = join(' ',@str);
     print "@str\n";
     foreach (@str) {
@@ -124,6 +123,9 @@ sub update_packages {
 	`/usr/bin/wget $mir$_`;
     }
     `urpmi $full_rpm`;
+    foreach $pack (@str) {
+	system("rm -f $pack");
+    }	
 }
 
 sub send_rpm_dif {
@@ -142,7 +144,7 @@ sub send_rpm_dif {
 }
 
 sub clean_dir() {
-    `rm -f /root/$login.$password.$box_name.$oldkey.dif /root/rpm_qa_installed_before /root/rpm_qa_installed_after`;    
+    system("rm -f /root/*.dif /root/rpm_qa_installed_before /root/rpm_qa_installed_after");    
     exit 1;
 }
 
-- 
cgit v1.2.1