Mailinglist Archive: yast-commit (490 mails)

[jsuchome@xxxxxxxxxxxxxxxx]

Author: jsuchome
Date: Tue Jun 12 08:43:25 2007
New Revision: 38400

URL: http://svn.opensuse.org/viewcvs/yast?rev=38400&view=rev
Log:
- use PkgTaboo instead of ResolvableNeutral if the package with
  declined license should not be installed (#279491)
- run PkgSolve after those PkgTaboo and open package selector for
  user interaction if Solver fails (#279491)
- 2.13.61


Modified:
    branches/SuSE-SLE-10-SP1-Branch/online-update/VERSION
    branches/SuSE-SLE-10-SP1-Branch/online-update/package/yast2-online-update.changes
    branches/SuSE-SLE-10-SP1-Branch/online-update/src/inst_you.ycp
    branches/SuSE-SLE-10-SP1-Branch/online-update/src/online_update_install.ycp

Modified: branches/SuSE-SLE-10-SP1-Branch/online-update/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/online-update/VERSION?rev=38400&r1=38399&r2=38400&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/online-update/VERSION (original)
+++ branches/SuSE-SLE-10-SP1-Branch/online-update/VERSION Tue Jun 12 08:43:25 2007
@@ -1 +1 @@
-2.13.60
+2.13.61

Modified: branches/SuSE-SLE-10-SP1-Branch/online-update/package/yast2-online-update.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/online-update/package/yast2-online-update.changes?rev=38400&r1=38399&r2=38400&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/online-update/package/yast2-online-update.changes (original)
+++ branches/SuSE-SLE-10-SP1-Branch/online-update/package/yast2-online-update.changes Tue Jun 12 08:43:25 2007
@@ -1,4 +1,13 @@
 -------------------------------------------------------------------
+Fri Jun  8 09:05:04 CEST 2007 - jsuchome@xxxxxxx
+
+- use PkgTaboo instead of ResolvableNeutral if the package with
+  declined license should not be installed (#279491)
+- run PkgSolve after those PkgTaboo and open package selector for
+  user interaction if Solver fails (#279491)
+- 2.13.61
+
+-------------------------------------------------------------------
 Thu May 31 21:03:08 CEST 2007 - jsuchome@xxxxxxx
 
 - when the package selector is skipped, check if there are not

Modified: branches/SuSE-SLE-10-SP1-Branch/online-update/src/inst_you.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/online-update/src/inst_you.ycp?rev=38400&r1=38399&r2=38400&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/online-update/src/inst_you.ycp (original)
+++ branches/SuSE-SLE-10-SP1-Branch/online-update/src/inst_you.ycp Tue Jun 12 08:43:25 2007
@@ -116,7 +116,6 @@
 
     integer selected   = 0;
     boolean check_licenses     = false;
-    list neutralized   = [];
 
     // check if there exists saved selection of patches to be installed
     if (FileUtils::Exists (saved_path))
@@ -216,6 +215,7 @@
     // if the package selector was not opened, ask to confirm licenses
     if (check_licenses)
     {
+       boolean rejected        = false;
        foreach (string p, Pkg::GetPackages (`selected, true), {
            string license = Pkg::PkgGetLicenseToConfirm (p);
            if (license != nil && license != "")
@@ -230,8 +230,8 @@
                    `focus_none))
                {
                    y2milestone("License not accepted: %1", p);
-                   Pkg::ResolvableNeutral (p, `package, true);
-                   neutralized = add (neutralized, p);
+                   Pkg::PkgTaboo (p);
+                   rejected    = true;
                }
                else
                {
@@ -239,25 +239,17 @@
                }
            }
        });
-       if (neutralized != [])
+       // we must run solver again and offer manual intervention if it fails
+       if (rejected && !Pkg::PkgSolve (true))
        {
-           // now, neutralize also the patches related to neutralized packages
-           foreach (map patch, Pkg::ResolvableDependencies ("", `patch, ""), {
-               if (patch["status"]:`none == `selected)
-               {
-                   foreach (map dep, (list<map>)patch["dependencies"]:[], {
-                       string kind     = dep["res_kind"]:"";
-                       string pname    = dep["name"]:"";
-                       pname   = substring (pname, 0, findfirstof (pname, " "));
-                       if ((kind == "package" || kind == "atom") &&
-                           dep["dep_kind"]:"" == "requires" &&
-                           contains (neutralized, pname))
-                       {
-                           Pkg::ResolvableNeutral (patch["name"]:"", `patch, true);
-                       }
-                   });
-               }
-           });
+           UI::OpenDialog (`opt (`defaultsize), `PackageSelector (`id(`selector), `opt(`youMode)));
+           symbol ret_sel = (symbol)UI::RunPkgSelection (`id (`selector));
+           UI::CloseDialog ();
+           if (ret_sel == `cancel)
+           {
+               y2milestone ("package selector canceled -> `next");
+               return `next;
+           }
        }
     }
     // install the patches

Modified: branches/SuSE-SLE-10-SP1-Branch/online-update/src/online_update_install.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/online-update/src/online_update_install.ycp?rev=38400&r1=38399&r2=38400&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/online-update/src/online_update_install.ycp (original)
+++ branches/SuSE-SLE-10-SP1-Branch/online-update/src/online_update_install.ycp Tue Jun 12 08:43:25 2007
@@ -55,9 +55,10 @@
                        help_text, false, false);
 
   if (!Stage::cont ())
+  {
     Wizard::SetNextButton(`next, Label::FinishButton() );
-
-  Pkg::PkgSolve (true);
+    Pkg::PkgSolve (true);
+  }
 
   integer total_progress = size (Pkg::GetPackages (`selected, true)) * 2;
   if (total_progress == 0)

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx