# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1569498940 -7200
# Node ID 974cf6a79cc42800c2791da056a605d15c5c3550
# Parent  f03cb925353c71d3361573cc922e5f1c86a0d763
Do not suggest packages twice

diff -r f03cb925353c -r 974cf6a79cc4 step1.php
--- a/step1.php	Wed Sep 25 19:08:26 2019 +0200
+++ b/step1.php	Thu Sep 26 13:55:40 2019 +0200
@@ -2,7 +2,7 @@
 
 shell_exec("sudo ./helper --chkdist"); 
 $usedvars = array( "kernel", "modules", "packages", "toconfigure",
-	"continue", "configuring", "tmp_dir" );
+	"continue", "configuring", "already_suggested", "tmp_dir" );
 
 function set_tmp_dir()
 {
@@ -51,6 +51,10 @@
 	}
 }
 
+if (isset($_POST['EXTRA_SUGGESTED'])) {
+	$_POST['already_suggested'] .= " ".$_POST['EXTRA_SUGGESTED'];
+}
+
 if (isset($_POST['mykernel']) && !isset($_POST['packages'])) {
         $_POST['kernel'] = "custom";
 	upload("uploadkernel","kernel");
diff -r f03cb925353c -r 974cf6a79cc4 step4.php
--- a/step4.php	Wed Sep 25 19:08:26 2019 +0200
+++ b/step4.php	Thu Sep 26 13:55:40 2019 +0200
@@ -35,7 +35,8 @@
 		unset($pkgs[$key]);
 		$_POST['toconfigure'] = implode(" ", $pkgs);
 		$output .= shell_exec("./helper --list-suggested $pkg ".
-			$_POST['tmp_dir']." ".$_POST['packages']); 
+			$_POST['tmp_dir']." ".$_POST['packages'].
+			$_POST['already_suggested']); 
 		if ($output == "") {
 			shell_exec("sudo ./helper --post-install $pkg ".
 				   $_POST['tmp_dir']);