From a55eb1796ef9105064d03c7c70ea04ebe7c387a0 Mon Sep 17 00:00:00 2001
From: Anne Nicolas <ennael@mageia.org>
Date: Tue, 13 Jan 2015 14:56:56 +0100
Subject: Use recommends instead of deprecated suggests

---
 BCD/Media.pm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/BCD/Media.pm b/BCD/Media.pm
index c39652b..750c07a 100644
--- a/BCD/Media.pm
+++ b/BCD/Media.pm
@@ -243,14 +243,13 @@ sub mini_chroot {
 	# it is usefull to use a mini chroot for add remove media, we have to keep the list of installed packages to copy them on ISO
 	print_color("$LOG create a mini chroot to run urpmi", $color);
 	# store all file needed to be installed on the system
-	my $cmd = "LC_ALL=C sudo urpmi --quiet --no-suggests --auto --no-verify-rpm --use-distrib $repo/$based_on/$arch --urpmi-root $chroot_path --media '$isoconf->{chroot_media}' --excludemedia '$isoconf->{chroot_media_exclude}'";
+	my $cmd = "LC_ALL=C sudo urpmi --quiet --no-recommends --auto --no-verify-rpm --use-distrib $repo/$based_on/$arch --urpmi-root $chroot_path --media '$isoconf->{chroot_media}' --excludemedia '$isoconf->{chroot_media_exclude}'";
 	#  sudo urpmi --no-verify-rpm --auto --urpmi-root /tmp/mk --use-distrib /mnt/BIG/dis/2009.0/i586/ basesystem-minimal urpmi --test
 	#
-	system("LC_ALL=C sudo urpmi --test --no-suggests --auto --no-verify-rpm --use-distrib $repo/$based_on/$arch --urpmi-root $chroot_path --media '$isoconf->{chroot_media}' --excludemedia '$isoconf->{chroot_media_exclude}' urpmi basesystem-minimal bash basesystem > $chroot_path/$isoconf->{tocopy_file}_TODO_chroot");
+	system("LC_ALL=C sudo urpmi --test --no-recommends --auto --no-verify-rpm --use-distrib $repo/$based_on/$arch --urpmi-root $chroot_path --media '$isoconf->{chroot_media}' --excludemedia '$isoconf->{chroot_media_exclude}' urpmi basesystem-minimal bash basesystem > $chroot_path/$isoconf->{tocopy_file}_TODO_chroot");
 	# install all those file to be able to use urpmi.XXXXXX
 	system("LC_ALL=C $cmd --prefer $DISTRIB,$THEME urpmi rootfiles rpm-helper mageia-release-common");
         system("sudo chroot $chroot_path mkdir -p $distrib_path");
-	print "BLBLBLBLBL sudo mount -o bind $repo/$based_on/$arch $chroot_path/$distrib_path\n";
 	system("sudo mount -o bind $repo/$based_on/$arch $chroot_path/$distrib_path");
 	system("sudo mount -o remount,ro,bind $chroot_path/$distrib_path");
 	push @to_umount, $distrib_path;
@@ -412,10 +411,10 @@ sub create_list {
 	}
     }
 
-    # check the suggests option in the XML configuration
+    # check the recommends option in the XML configuration
     my $opt_sug; my $opt_srpm;
     if ($media->{nosuggests} eq "yes") {
-	$opt_sug = "--no-suggests";
+	$opt_sug = "--no-recommends";
     } else { $opt_sug = ""; } 
     if ($media->{nsrpm} eq "yes") {
 	$opt_srpm = "--src";
@@ -942,7 +941,7 @@ sub get_srpms_list {
 				if (-f "$repo/$based_on/SRPMS/$media->{mediadir}/$_/$srpm") {
 					$SRPMS_PATH="$repo/$based_on/SRPMS/$media->{mediadir}/$_/";
 					my $media="--sortmedia \"$isoconf->{media}{first_media},$isoconf->{media}{first_media} $isoconf->{media}{update_prefix}\"";
-					system("LC_ALL=C urpmq --use-distrib $repo/$based_on/$arch $media --sources --requires-recursive --prefer $DISTRIB,$THEME,kernel-source-dekstop --no-suggests $SRPMS_PATH/$srpm >  $list_buildreq-$srpm");
+					system("LC_ALL=C urpmq --use-distrib $repo/$based_on/$arch $media --sources --requires-recursive --prefer $DISTRIB,$THEME,kernel-source-dekstop --no-recommends $SRPMS_PATH/$srpm >  $list_buildreq-$srpm");
 					last;
 				} else { 
 					#print "$repo/$based_on/SRPMS/$media->{mediadir}/$_/$srpm doesnt exist \n";
@@ -953,8 +952,8 @@ sub get_srpms_list {
 			$pm->wait_all_children;
 	    	}
     		system("cat $tmp_bs/list_BUILDREQ-* | sort | uniq > $list_buildreq");
-    		system("cp $list_buildreq $chroot_path/list_ALL_BUILDREQ");
-		system("cp $list_srpm $chroot_path/list_ALL_SRPM");
+    		system("sudo cp $list_buildreq $chroot_path/list_ALL_BUILDREQ");
+		system("sudo cp $list_srpm $chroot_path/list_ALL_SRPM");
 #		system("rm -f $tmp_bs/list_BUILDREQ-* $tmp_bs/list_SRPM-*");
 	}
 }
-- 
cgit v1.2.1