moved depslist computation out of loop of hdlist reading.

3 files changed, 10 insertions, 6 deletions

diff --git a/urpm.pm b/urpm.pm
index d24b3fd5..d6fe6b84 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -241,7 +241,7 @@ sub probe_medium {
 	}
     }
     $medium->{url} ||= $medium->{clear_url};
-    $medium->{removable} ||= $medium->{url} =~ /^removable_([^_:]*)(?:_[^:]*)?:/ && "/dev/$1";
+    $medium->{removable} ||= $medium->{url} =~ /^removable_([^_:]*)(?:_[^:]*)?:/ && "/dev/$1"; #"
     $medium;
 }
 
@@ -311,7 +311,7 @@ sub add_medium {
 
 	#- add some more flags for this type of medium.
 	$medium->{clear_url} = $url;
-	$medium->{removable} = $url =~ /^removable_([^_:]*)(?:_[^:]*)?:/ && "/dev/$1";
+	$medium->{removable} = $url =~ /^removable_([^_:]*)(?:_[^:]*)?:/ && "/dev/$1"; #"
     }
 
     #- all flags once everything has been computed.
@@ -651,9 +651,9 @@ sub update_media {
 		$medium->{ignore} and next;
 		$urpm->{log}(_("reading hdlist file [%s]", "$urpm->{statedir}/$medium->{hdlist}"));
 		$urpm->{params}->read_hdlists("$urpm->{statedir}/$medium->{hdlist}") or next;
-		$urpm->{log}(_("computing dependencies"));
-		$urpm->{params}->compute_depslist();
 	    }
+	    $urpm->{log}(_("computing dependencies"));
+	    $urpm->{params}->compute_depslist();
 
 	    #- once everything has been computed, write back the files to
 	    #- sync the urpmi database.
diff --git a/urpmi b/urpmi
index d645771f..b0814ab1 100755
--- a/urpmi
+++ b/urpmi
@@ -84,7 +84,8 @@ for (@ARGV) {
     /^--X$/ and do { $X = 1; next };
     /^--WID=(.*)$/ and do { $WID = $1; next };
     /^--WID$/ and do { push @nextargv, \$WID; next };
-    /^--best-output$/ and do { $X ||= $ENV{DISPLAY} && system('/usr/X11R6/bin/xtest', '') == 0; next };
+    /^--best-output$/ and do { $X ||= $ENV{DISPLAY} && -x "/usr/X11R6/bin/grpmi" && system('/usr/X11R6/bin/xtest', '') == 0;
+			       next };
     /^--comment$/ and do { push @nextargv, undef; next };
     /^-(.*)$/ and do { foreach (split //, $1) {
 	/[\?h]/ and do { usage; next };
diff --git a/urpmi.spec b/urpmi.spec
index b4c84582..c4851b4f 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
 
 Name: urpmi
 Version: 1.7
-Release: 8mdk
+Release: 9mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Source1: %{name}.logrotate
@@ -114,6 +114,9 @@ rm -f /var/lib/urpmi/depslist
 
 
 %changelog
+* Mon Sep 10 2001 François Pons <fpons@mandrakesoft.com> 1.7-9mdk
+- moved depslist computation out of loop of reading.
+
 * Mon Sep  3 2001 François Pons <fpons@mandrakesoft.com> 1.7-8mdk
 - updated fr man pages (pablo).
 - avoid eject removable medium if --auto is given.