Mailinglist Archive: yast-commit (864 mails)

[jsuchome@xxxxxxxxxxxxxxxx]

Author: jsuchome
Date: Wed Nov 21 15:17:16 2007
New Revision: 42280

URL: http://svn.opensuse.org/viewcvs/yast?rev=42280&view=rev
Log:
- correct fix of #279491 merged from SP1 code
- show visible label that patch installation was finished (#191400)
- 2.16.5


Modified:
    trunk/online-update/VERSION
    trunk/online-update/package/yast2-online-update.changes
    trunk/online-update/src/inst_you.ycp
    trunk/online-update/src/online_update_install.ycp
    trunk/online-update/yast2-online-update.spec.in

Modified: trunk/online-update/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=42280&r1=42279&r2=42280&view=diff
==============================================================================
--- trunk/online-update/VERSION (original)
+++ trunk/online-update/VERSION Wed Nov 21 15:17:16 2007
@@ -1 +1 @@
-2.16.4
+2.16.5

Modified: trunk/online-update/package/yast2-online-update.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-online-update.changes?rev=42280&r1=42279&r2=42280&view=diff
==============================================================================
--- trunk/online-update/package/yast2-online-update.changes (original)
+++ trunk/online-update/package/yast2-online-update.changes Wed Nov 21 15:17:16 
2007
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Nov 19 16:14:51 CET 2007 - jsuchome@xxxxxxx
+
+- correct fix of #279491 merged from SP1 code
+- show visible label that patch installation was finished (#191400)
+- 2.16.5
+
+-------------------------------------------------------------------
 Thu Nov 15 16:03:56 CET 2007 - jsuchome@xxxxxxx
 
 - report error of Pkg::SourceStartManager (#180172)

Modified: trunk/online-update/src/inst_you.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/inst_you.ycp?rev=42280&r1=42279&r2=42280&view=diff
==============================================================================
--- trunk/online-update/src/inst_you.ycp (original)
+++ trunk/online-update/src/inst_you.ycp Wed Nov 21 15:17:16 2007
@@ -117,7 +117,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))
@@ -217,6 +216,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 != "")
@@ -231,8 +231,8 @@
                    `focus_none))
                {
                    y2milestone("License not accepted: %1", p);
-                   Pkg::ResolvableNeutral (p, `package, true);
-                   neutralized = add (neutralized, p);
+                   Pkg::PkgTaboo (p);
+                   rejected    = true;
                }
                else
                {
@@ -240,25 +240,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: trunk/online-update/src/online_update_install.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/online_update_install.ycp?rev=42280&r1=42279&r2=42280&view=diff
==============================================================================
--- trunk/online-update/src/online_update_install.ycp (original)
+++ trunk/online-update/src/online_update_install.ycp Wed Nov 21 15:17:16 2007
@@ -26,8 +26,10 @@
            // progress window label
             `LogView(`id(`log), _("Progress Log"), 5, 0 ),
            `VSpacing( 0.5 ),
-           // progress bar label
-            `ProgressBar( `id( `you_patch_progress ), _("Package Progress") ),
+           `ReplacePoint (`id (`rppatch),
+               // progress bar label
+               `ProgressBar (`id (`you_patch_progress), _("Package Progress"))
+           ),
             `VSpacing( 0.2 ),
            `ReplacePoint (`id(`rpprogress),
                // progress bar label
@@ -54,7 +56,11 @@
   if (!Stage::cont ())
     Wizard::SetNextButton(`next, Label::FinishButton() );
 
-  Pkg::PkgSolve (true);
+  if (!Stage::cont ())
+  {
+    Wizard::SetNextButton(`next, Label::FinishButton() );
+    Pkg::PkgSolve (true);
+  }
 
   integer total_progress = size (Pkg::GetPackages (`selected, true)) * 2;
   if (total_progress == 0)
@@ -75,6 +81,17 @@
   // progress information
   OnlineUpdateCallbacks::ProgressLog (_("Installation finished.\n"));
 
+  if (Stage::cont ())
+  {
+    // one more finish message (#191400)
+    UI::ReplaceWidget (`id (`rppatch),
+       // label
+       `Left (`Label (`opt (`boldFont), _("Patch installation finished.")))
+    );
+    UI::ReplaceWidget (`id(`rpprogress), `Empty ());
+  }
+
+
   if ( commit[1]:[] != [] ) {
     string details = Pkg::LastError() + "\n" + Pkg::LastErrorDetails();
     // error message

Modified: trunk/online-update/yast2-online-update.spec.in
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/online-update/yast2-online-update.spec.in?rev=42280&r1=42279&r2=42280&view=diff
==============================================================================
--- trunk/online-update/yast2-online-update.spec.in (original)
+++ trunk/online-update/yast2-online-update.spec.in Wed Nov 21 15:17:16 2007
@@ -89,7 +89,9 @@
     # remove the.desktop from the older unhacked package during update
     rm -f /usr/share/applications/YaST2/cd_update.desktop
 else
-    cp /var/lib/YaST2/cd_update.desktop /usr/share/applications/YaST2/
+    if [ -f /var/lib/YaST2/cd_update.desktop ] ; then
+       cp /var/lib/YaST2/cd_update.desktop /usr/share/applications/YaST2/
+    fi
 fi
 
 %files frontend

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