Mailinglist Archive: opensuse-commit (861 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package autoyast2 for openSUSE:Factory
checked in at Mon Jan 24 16:07:05 CET 2011.



--------
--- autoyast2/autoyast2.changes 2011-01-04 12:11:55.000000000 +0100
+++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes    2011-01-19 
15:22:42.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Jan 19 15:15:20 CET 2011 - jsrain@xxxxxxx
+
+- adaptations for unattended migration (fate#310481)
+- 2.20.4
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  autoyast2-2.20.3.tar.bz2

New:
----
  autoyast2-2.20.4.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.vQrGbo/_old  2011-01-24 16:06:53.000000000 +0100
+++ /var/tmp/diff_new_pack.vQrGbo/_new  2011-01-24 16:06:53.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package autoyast2 (Version 2.20.3)
+# spec file for package autoyast2
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,11 +19,11 @@
 
 
 Name:           autoyast2
-Version:        2.20.3
+Version:        2.20.4
 Release:        1
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        autoyast2-2.20.3.tar.bz2
+Source0:        autoyast2-2.20.4.tar.bz2
 
 Prefix:         /usr
 
@@ -65,7 +65,7 @@
 
 %package installation
 License:        GPLv2+
-Version:        2.20.3
+Version:        2.20.4
 Release:        1
 Summary:        YaST2 - Auto Installation Modules
 Group:          System/YaST
@@ -82,7 +82,7 @@
 generated with the autoyast2 package.
 
 %prep
-%setup -n autoyast2-2.20.3
+%setup -n autoyast2-2.20.4
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -241,6 +241,9 @@
 /usr/share/YaST2/clients/autoinst_scripts1_finish.ycp
 /usr/share/YaST2/clients/autoinst_scripts2_finish.ycp
 /usr/share/YaST2/clients/ayast_probe.ycp
+/usr/share/YaST2/clients/inst_autosetup_upgrade.ycp
+/usr/share/YaST2/clients/inst_store_upgrade_software.ycp
+
 /usr/share/YaST2/include/autoinstall/xml.ycp
 /usr/share/YaST2/include/autoinstall/ask.ycp
 

++++++ autoyast2-2.20.3.tar.bz2 -> autoyast2-2.20.4.tar.bz2 ++++++
++++ 4085 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/autoyast2-2.20.3/VERSION new/autoyast2-2.20.4/VERSION
--- old/autoyast2-2.20.3/VERSION        2011-01-04 12:04:27.000000000 +0100
+++ new/autoyast2-2.20.4/VERSION        2011-01-19 15:15:35.000000000 +0100
@@ -1 +1 @@
-2.20.3
+2.20.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/autoyast2-2.20.3/configure.in new/autoyast2-2.20.4/configure.in
--- old/autoyast2-2.20.3/configure.in   2011-01-04 12:06:12.000000000 +0100
+++ new/autoyast2-2.20.4/configure.in   2011-01-19 15:22:18.000000000 +0100
@@ -3,7 +3,7 @@
 dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(autoyast2, 2.20.3, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.20.4, http://bugs.opensuse.org/, autoyast2)
 dnl Check for presence of file 'RPMNAME'
 AC_CONFIG_SRCDIR([RPMNAME])
 
@@ -18,7 +18,7 @@
 AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
 
 dnl Important YaST2 variables
-VERSION="2.20.3"
+VERSION="2.20.4"
 RPMNAME="autoyast2"
 MAINTAINER="Uwe Gansert <ug@xxxxxxx>"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/autoyast2-2.20.3/src/clients/Makefile.am 
new/autoyast2-2.20.4/src/clients/Makefile.am
--- old/autoyast2-2.20.3/src/clients/Makefile.am        2010-10-12 
17:03:24.000000000 +0200
+++ new/autoyast2-2.20.4/src/clients/Makefile.am        2011-01-19 
15:16:36.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # Makefile.am for y2c_autoinst/src
 #
-# $Id: Makefile.am 35221 2007-01-11 11:40:16Z ug $
+# $Id: Makefile.am 63230 2011-01-19 14:16:35Z jsrain $
 #
 client_DATA = \
     autoyast.ycp \
@@ -13,6 +13,8 @@
     inst_autoinit.ycp \
     inst_autopost.ycp \
     inst_autosetup.ycp \
+    inst_autosetup_upgrade.ycp \
+    inst_store_upgrade_software.ycp \
     report_auto.ycp \
     scripts_auto.ycp \
     software_auto.ycp \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/autoyast2-2.20.3/src/clients/autoinst_scripts1_finish.ycp 
new/autoyast2-2.20.4/src/clients/autoinst_scripts1_finish.ycp
--- old/autoyast2-2.20.3/src/clients/autoinst_scripts1_finish.ycp       
2010-10-12 17:03:24.000000000 +0200
+++ new/autoyast2-2.20.4/src/clients/autoinst_scripts1_finish.ycp       
2011-01-19 15:16:36.000000000 +0100
@@ -8,7 +8,7 @@
  * Authors:
  *  Jiri Srain <jsrain@xxxxxxx>
  *
- * $Id: autoinst_scripts1_finish.ycp 27936 2006-02-13 20:01:14Z olh $
+ * $Id: autoinst_scripts1_finish.ycp 63230 2011-01-19 14:16:35Z jsrain $
  *
  */
 
@@ -42,7 +42,7 @@
        "steps" : 1,
        // progress step title
        "title" : _("Executing autoinstall scripts in the installation 
environment..."),
-        "when" : [ `autoinst ],
+        "when" : [ `autoinst, `autoupg ],
     ];
 }
 else if (func == "Write")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/autoyast2-2.20.3/src/clients/autoinst_scripts2_finish.ycp 
new/autoyast2-2.20.4/src/clients/autoinst_scripts2_finish.ycp
--- old/autoyast2-2.20.3/src/clients/autoinst_scripts2_finish.ycp       
2010-10-12 17:03:24.000000000 +0200
+++ new/autoyast2-2.20.4/src/clients/autoinst_scripts2_finish.ycp       
2011-01-19 15:16:36.000000000 +0100
@@ -8,7 +8,7 @@
  * Authors:
  *  Jiri Srain <jsrain@xxxxxxx>
  *
- * $Id: autoinst_scripts2_finish.ycp 47536 2008-05-14 14:28:48Z ug $
+ * $Id: autoinst_scripts2_finish.ycp 63230 2011-01-19 14:16:35Z jsrain $
  *
  */
 
@@ -40,7 +40,7 @@
        "steps" : 1,
        // progress step title
        "title" : _("Executing autoinstall scripts in the installation 
environment..."),
-        "when" : [ `autoinst ],
+        "when" : [ `autoinst, `autoupg ],
     ];
 }
 else if (func == "Write")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/autoyast2-2.20.3/src/clients/inst_autoconfigure.ycp 
new/autoyast2-2.20.4/src/clients/inst_autoconfigure.ycp
--- old/autoyast2-2.20.3/src/clients/inst_autoconfigure.ycp     2010-10-12 
17:03:24.000000000 +0200
+++ new/autoyast2-2.20.4/src/clients/inst_autoconfigure.ycp     2011-01-19 
15:16:36.000000000 +0100
@@ -5,7 +5,7 @@
  * Summary:    This module finishes auto-installation and configures
  *             the system as described in the profile file.
  *
- * $Id: inst_autoconfigure.ycp 62444 2010-08-30 11:06:41Z ug $
+ * $Id: inst_autoconfigure.ycp 63230 2011-01-19 14:16:35Z jsrain $
  */
 
 {
@@ -112,10 +112,13 @@
 
     y2milestone("Order: %1", maplist(map d, deps, ``(d["res"]:"")));
 
-    if (!haskey(Profile::current , "networking") ) {
-        removeNetwork(); // no networking section -> no network
-    } else if( Profile::current["networking","keep_install_network"]:false == 
false ) {
-        removeNetwork(); // networking section without keeping the install 
network
+    // keep network on AutoYaST ugprade
+    if (! Mode::autoupgrade()) {
+        if (!haskey(Profile::current , "networking") ) {
+            removeNetwork(); // no networking section -> no network
+        } else if( Profile::current["networking","keep_install_network"]:false 
== false ) {
+            removeNetwork(); // networking section without keeping the install 
network
+        }
     }
 
     foreach(map r, deps,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/autoyast2-2.20.3/src/clients/inst_autoinit.ycp 
new/autoyast2-2.20.4/src/clients/inst_autoinit.ycp
--- old/autoyast2-2.20.3/src/clients/inst_autoinit.ycp  2010-10-12 
17:03:24.000000000 +0200
+++ new/autoyast2-2.20.4/src/clients/inst_autoinit.ycp  2011-01-19 
15:16:36.000000000 +0100
@@ -4,7 +4,7 @@
  * Summary:    Parses XML Profile for automatic installation
  * Authors:    Anas Nashif <nashif@xxxxxxx>
  *
- * $Id: inst_autoinit.ycp 53201 2008-11-12 13:21:33Z ug $
+ * $Id: inst_autoinit.ycp 63230 2011-01-19 14:16:35Z jsrain $
  *
  */
 
@@ -23,6 +23,7 @@
 //    import "Arch";
     import "Call";
     import "Console";
+    import "Mode";
 
     import "Popup";
 
@@ -165,10 +166,22 @@
     }
 
     Progress::Title(_("Probing hardware..."));
-    WFM::CallFunction("inst_system_analysis", [] );
+
+    if (! (Mode::autoupgrade() && AutoinstConfig::ProfileInRootPart))
+       WFM::CallFunction("inst_system_analysis", [] );
     AutoInstallRules::ProbeRules();
 
     if( ! profileFetched ) {
+
+
+       // if profile is defined, first read it, then probe hardware
+        any autoinstall = SCR::Read(.etc.install_inf.AutoYaST);
+        if (Mode::autoupgrade() && ! (autoinstall != nil && is ( autoinstall , 
string ) && (string)autoinstall != ""))
+       {
+           AutoinstConfig::ParseCmdLine("file:///mnt/root/autoupg.xml");
+           AutoinstConfig::ProfileInRootPart = true;
+       }
+
         symbol ret = processProfile();
         if( ret != `ok ) {
             return ret;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/autoyast2-2.20.3/src/clients/inst_autosetup_upgrade.ycp 
new/autoyast2-2.20.4/src/clients/inst_autosetup_upgrade.ycp
--- old/autoyast2-2.20.3/src/clients/inst_autosetup_upgrade.ycp 1970-01-01 
01:00:00.000000000 +0100
+++ new/autoyast2-2.20.4/src/clients/inst_autosetup_upgrade.ycp 2011-01-18 
14:20:36.000000000 +0100
@@ -0,0 +1,434 @@
+/**
+ * File:    clients/inst_autosetup.ycp
+ * Package: Auto-installation
+ * Summary: Setup and prepare system for auto-installation
+ * Authors: Anas Nashif <nashif@xxxxxxx>
+ *          Uwe Gansert <ug@xxxxxxx>
+ *
+ * $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $
+ */
+
+{
+    textdomain "autoinst";
+
+    import "AutoinstConfig";
+    import "AutoInstall";
+    import "Installation";
+    import "Profile";
+    import "Progress";
+    import "Report";
+    import "AutoinstStorage";
+    import "AutoinstScripts";
+    import "AutoinstGeneral";
+    import "AutoinstSoftware";
+    import "Bootloader";
+    import "BootCommon";
+    import "Popup";
+    import "RunlevelEd";
+    import "Arch";
+    import "AutoinstLVM";
+    import "AutoinstRAID";
+    import "Storage";
+    import "Timezone";
+    import "Keyboard";
+    import "Call";
+    import "ProductControl";
+    import "LanUdevAuto";
+    import "Language";
+    import "Console";
+
+    include "bootloader/routines/autoinstall.ycp";
+    include "autoinstall/ask.ycp";
+
+    define symbol readModified() {
+        if (SCR::Read(.target.size, AutoinstConfig::modified_profile) > 0 ) {
+            if (! Profile::ReadXML( AutoinstConfig::modified_profile ) || 
Profile::current == $[] ) {
+                Popup::Error(_("Error while parsing the control file.
+Check the log files for more details or fix the
+control file and try again.
+"));
+                return `abort;
+            }
+            string cpcmd = sformat("mv %1 %2","/tmp/profile/autoinst.xml", 
"/tmp/profile/pre-autoinst.xml");
+            y2milestone("copy original profile: %1",cpcmd);
+            SCR::Execute(.target.bash, cpcmd);
+
+            cpcmd = sformat("mv %1 %2", AutoinstConfig::modified_profile, 
"/tmp/profile/autoinst.xml");
+            y2milestone("moving modified profile: %1",cpcmd);
+            SCR::Execute(.target.bash, cpcmd);
+            return `found;
+        }
+        return `not_found;
+    }
+
+    string help_text = _("<P>Please wait while the system is prepared for 
autoinstallation.</P>");
+    list<string> progress_stages =
+        [
+    _("Configure General Settings "),
+    _("Execute pre-install user scripts"),
+    _("Set up language"),
+    _("Configure Software selections"),
+        ];
+
+    list<string> progress_descriptions =
+        [
+    _("Configuring general settings..."),
+    _("Executing pre-install user scripts..."),
+    _("Configuring Software selections...")
+        ];
+
+    Progress::New(
+            _("Preparing System for Automated Installation"),
+            "",     // progress_title
+            size( progress_stages ),   // progress bar length
+            progress_stages,
+            progress_descriptions,
+            help_text );
+
+
+    if(UI::PollInput() == `abort)
+        if (Popup::ConfirmAbort (`painless))
+            return `abort;
+    Progress::NextStage();
+
+
+    // configure general settings
+
+
+
+
+
+    if(UI::PollInput() == `abort)
+       if (Popup::ConfirmAbort (`painless))
+           return `abort;
+
+    Progress::NextStage();
+
+    // Pre-Scripts
+    AutoinstScripts::Import(Profile::current["scripts"]:$[]);
+    AutoinstScripts::Write("pre-scripts", false);
+
+    // Reread Profile in case it was modified in pre-script
+    // User has to create the new profile in a pre-defined
+    // location for easy processing in pre-script.
+
+    if( readModified() == `abort )
+        return `abort;
+
+    //
+    // Partitioning and Storage
+    ////////////////////////////////////////////////////////////////////////
+
+    boolean modified = true;
+    do {
+        askDialog();
+        // Pre-Scripts
+        AutoinstScripts::Import(Profile::current["scripts"]:$[]);
+        AutoinstScripts::Write("pre-scripts", false);
+        symbol ret = readModified();
+        if( ret == `abort )
+            return `abort;
+        if( ret == `not_found )
+            modified = false;
+    } while( modified == true );
+
+    // reimport scripts, for the case <ask> has changed them
+    AutoinstScripts::Import(Profile::current["scripts"]:$[]);
+    //
+    // Set Mouse and other workflow variables
+    //
+    AutoinstGeneral::Import(Profile::current["general"]:$[]);
+    y2milestone("general: %1", Profile::current["general"]:$[] );
+    AutoinstGeneral::Write();
+
+    if( haskey( Profile::current, "add-on" ) ) {
+        Call::Function("add-on_auto", ["Import", 
Profile::current["add-on"]:$[]] );
+        Call::Function("add-on_auto", ["Write"]);
+    }
+
+    boolean use_utf8 = true;           // utf8 is default
+
+    map displayinfo = UI::GetDisplayInfo();
+    if ( ! displayinfo["HasFullUtf8Support"]:true )
+    {
+       use_utf8 = false;               // fallback to ascii
+    }
+
+
+    //
+    // Set it in the Language module.
+    //
+    Progress::NextStep();
+    Progress::Title(_("Configuring language..."));
+    Language::Import( Profile::current["language"]:$[] );
+
+    //
+    // Set Console font
+    //
+    Installation::encoding = Console::SelectFont( Language::language );
+
+    if (displayinfo["HasFullUtf8Support"]:true)
+    {
+        Installation::encoding = "UTF-8";
+    }
+
+    UI::SetLanguage (Language::language, Installation::encoding);
+    WFM::SetLanguage (Language::language, "UTF-8");
+
+    if( haskey( Profile::current, "timezone" ) )
+        Timezone::Import(Profile::current["timezone"]:$[]);
+    if( haskey( Profile::current, "keyboard" ) )
+        Keyboard::Import(Profile::current["keyboard"]:$[]);
+
+
+    // one can override the <confirm> option by the commandline parameter 
y2confirm
+    string tmp = (string)SCR::Read (.target.string, "/proc/cmdline");
+    if (tmp != nil && contains (splitstring (tmp, " \n"), "y2confirm")) {
+        AutoinstConfig::Confirm = true;
+        y2milestone("y2confirm found and confirm turned on");
+    }
+
+
+    if(UI::PollInput() == `abort)
+       if (Popup::ConfirmAbort (`painless))
+           return `abort;
+
+    // moved here from autoinit for fate #301193
+    // needs testing
+    if( Arch::s390 () && AutoinstConfig::remoteProfile == true ) {
+       y2milestone("arch=s390 and remote_profile=true");
+       if( haskey(Profile::current, "dasd") ) {
+            y2milestone("dasd found");
+            Call::Function("dasd_auto", ["Import", 
Profile::current["dasd"]:$[] ]);
+        }
+        if( haskey(Profile::current, "zfcp") ) {
+            y2milestone("zfcp found");
+            Call::Function("zfcp_auto", ["Import", 
Profile::current["zfcp"]:$[] ]);
+        }
+    }
+
+    Progress::NextStage();
+
+    Storage::ReReadTargetMap();
+
+    if (! (Mode::autoupgrade() && AutoinstConfig::ProfileInRootPart)) {
+        if (`abort == WFM::CallFunction("inst_update_partition_auto", []))
+           return `abort;
+    }
+
+
+    // Software
+
+    if(UI::PollInput() == `abort)
+       if (Popup::ConfirmAbort (`painless))
+           return `abort;
+
+    Progress::NextStage();
+
+        // initialize package manager
+       import "Packages";
+       import "PackageCallbacks";
+       import "Update";
+       import "RootPart";
+       import "ProductFeatures";
+       import "Product";
+
+// FIXME FIXME FIXME copy-paste from update_proposal
+    map <string, any> GetUpdateConf () {
+        // 'nil' values are skipped, in that case, ZYPP uses own default values
+        map <string, boolean> ret = $[];
+
+// not supported by libzypp anymore
+//      if (Update::deleteOldPackages != nil) {
+//          ret["delete_unmaintained"] = Update::deleteOldPackages;
+//      }
+
+        if (Update::silentlyDowngradePackages != nil) {
+            ret["silent_downgrades"] = Update::silentlyDowngradePackages;
+        }
+
+        y2milestone ("Using update configuration: %1", ret);
+
+        return ret;
+    }
+
+        Packages::Init(true);
+
+        // initialize target
+        if (true)
+        {
+            PackageCallbacks::SetConvertDBCallbacks ();
+
+            Pkg::TargetInit (Installation::destdir, false);
+
+            Update::GetProductName ();
+        }
+
+        // FATE #301990, Bugzilla #238488
+        // Set initial update-related (packages/patches) values from control 
file
+        Update::InitUpdate();
+
+        // some products are listed in media control file and at least one is 
compatible
+        // with system just being updated
+        boolean update_not_possible = false;
+
+        // FATE #301844
+        y2milestone ("Previous '%1', New '%2' RootPart",
+            RootPart::previousRootPartition, RootPart::selectedRootPartition);
+        if (RootPart::previousRootPartition != 
RootPart::selectedRootPartition) {
+            RootPart::previousRootPartition = RootPart::selectedRootPartition;
+
+            // check whether update is possible
+            // reset deleteOldPackages and onlyUpdateInstalled in respect to 
the selected system
+            Update::Reset();
+            if (! Update::IsProductSupportedForUpgrade()) {
+                y2milestone ("Upgrade is not supported");
+                update_not_possible = true;
+            }
+        }
+
+       // this is new - override the default upgrade mode
+       if (Profile::current["upgrade","only_installed_packages"]:nil != nil)
+           Update::onlyUpdateInstalled = 
Profile::current["upgrade","only_installed_packages"]:true;
+
+        // connect target with package manager
+        if (!Update::did_init1)
+        {
+            Update::did_init1 = true;
+
+            if (size (Pkg::ResolvableProperties ("", `pattern, "")) > 0)
+            {
+                y2milestone ("No base selection found, but patterns found...");
+                Packages::using_patterns = true;
+            }
+
+            list<string> restore = [];
+            list<map<string,any> > selected = Pkg::ResolvableProperties ("", 
`product, "");
+            foreach (map<string,any> s, selected, {
+                restore = add (restore, s["name"]:"");
+            });
+
+            Pkg::PkgApplReset ();
+
+            // bnc #300540
+            // bnc #391785
+            // Drops packages after PkgApplReset, not before (that would null 
that)
+            Update::DropObsoletePackages();
+
+            foreach (string res, restore, {
+                Pkg::ResolvableInstall (res, `product);
+            });
+            if (! Update::onlyUpdateInstalled)
+            {
+                    if (Packages::using_patterns)
+                    {
+                        Update::SetDesktopPattern ();
+                    }
+                    else
+                    {
+                        Update::ProposeSelection ();
+                    }
+            }
+
+            if (Update::onlyUpdateInstalled)                    // just 
consider already installed packages
+            {
+                Pkg::SetSelection ("");                         // -> don't 
select any additional selections
+            }
+            else if (Packages::using_patterns)
+            {
+                if (! ProductFeatures::GetBooleanFeature ("software",
+                    "only_update_installed"))
+                {
+                    foreach (string pat, Product::patterns, {
+                        y2milestone("Pre-select pattern %1", pat);
+                        Pkg::ResolvableInstall( pat, `pattern );
+                    });
+                }
+
+            }
+            else                                                // update 
selections too
+            {
+                Pkg::SetSelection (Update::selected_selection); // -> set the 
base selection (minimal, default, ....)
+
+                if (!Update::manual_interaction)
+                {
+                    // now compare installed (old) selections against 
available (new) selections
+                    //  and set all selections which are installed (old) and 
available (new)
+                    //  as 'to be installed' -> UI will show "to be updated" 
for these selections
+
+                    list<string> available_addons = Pkg::GetSelections 
(`available, "");
+                    list<string> installed_addons = Pkg::GetSelections 
(`installed, "");
+
+                    foreach (string installed, installed_addons,
+                    {
+                        if (contains (available_addons, installed))     // we 
have a newer selection for an installed one
+                        {
+                            Pkg::SetSelection (installed);              // 
update this selection too (selection solving included)
+                        }
+                    });
+                }
+            }
+
+            Packages::SelectProduct();
+            Pkg::ActivateSelections ();                                 // now 
go through all selected selections and select their packages
+            // bnc #382208
+
+            // bnc#582702 - do not select kernel on update, leave that on 
dependencies like 'zypper dup'
+            // therefore commented line below out
+//          Packages::SelectKernelPackages ();
+
+            // FATE #301990, Bugzilla #238488
+            // Control the upgrade process better
+            map <symbol, integer> update_sum
+                = Pkg::PkgUpdateAll (GetUpdateConf());
+            y2milestone ("Update summary: %1", update_sum);
+            Update::unknown_packages = update_sum[`ProblemListSze]:0;
+
+            list<string> sys_patterns = Packages::ComputeSystemPatternList ();
+            foreach (string pat, sys_patterns, {
+                Pkg::ResolvableInstall (pat, `pattern);
+            });
+           // this is new, (de)select stuff from the profile
+            list<string> packages = Profile::current["software","packages"]:[];
+            list<string> patterns = Profile::current["software","patterns"]:[];
+            list<string> remove_packages = 
Profile::current["software","remove-packages"]:[];
+            list<string> remove_patterns = 
Profile::current["software","remove-patterns"]:[];
+           foreach (string p, remove_patterns, {
+               Pkg::ResolvableRemove (p, `pattern);
+           });
+           foreach (string p, remove_packages, {
+               Pkg::ResolvableRemove (p, `package);
+           });
+           foreach (string p, patterns, {
+               Pkg::ResolvableInstall (p, `pattern);
+           });
+           foreach (string p, packages, {
+               Pkg::ResolvableInstall (p, `package);
+           });
+           // old stuff again here
+            if (Pkg::PkgSolve (!Update::onlyUpdateInstalled))
+                Update::solve_errors = 0;
+            else
+           {
+                Update::solve_errors = Pkg::PkgSolveErrors ();
+               if (Profile::current["upgrade","stop_on_solver_conflict"]:true)
+                   AutoinstConfig::Confirm = true;
+           }
+
+        }
+
+    // Backup
+    y2internal ("Backup: %1", Profile::current["backup"]:nil);
+    Installation::update_backup_modified = 
Profile::current["backup","modified"]:true;
+    y2internal ("Backup modified: %1", Installation::update_backup_modified);
+    Installation::update_backup_sysconfig = 
Profile::current["backup","sysconfig"]:true;
+    Installation::update_remove_old_backups = 
Profile::current["backup","remove_old"]:false;
+
+    AutoInstall::TurnOff();
+    Progress::Finish();
+
+    symbol ret = ProductControl::RunFrom ( ProductControl::CurrentStep () + 1, 
true);
+    if (ret == `next)
+       return `finish;
+    return ret;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/autoyast2-2.20.3/src/clients/inst_store_upgrade_software.ycp 
new/autoyast2-2.20.4/src/clients/inst_store_upgrade_software.ycp
--- old/autoyast2-2.20.3/src/clients/inst_store_upgrade_software.ycp    
1970-01-01 01:00:00.000000000 +0100
+++ new/autoyast2-2.20.4/src/clients/inst_store_upgrade_software.ycp    
2011-01-18 14:20:36.000000000 +0100
@@ -0,0 +1,64 @@
+{
+    import "GetInstArgs";
+    import "Popup";
+    import "Profile";
+    import "Installation";
+
+    if ( GetInstArgs::going_back())
+        return `auto;
+
+    // find out status of patterns
+    list<map<string,any> > patterns = Pkg::ResolvableProperties ("", `pattern, 
"");
+    patterns = filter (map<string,any> p, patterns, {
+       return p["transact_by"]:nil == `user || p["transact_by"]:nil == 
`app_high;
+    });
+
+    list<string> patterns_to_remove = [];
+    list<string> patterns_to_install = maplist (map<string,any> p, patterns, {
+       if (p["status"]:nil == `selected || p["status"]:nil == `installed)
+           return p["name"]:"";
+       else if (p["status"]:nil == `removed || p["status"]:nil == `available)
+           patterns_to_remove = add (patterns_to_remove, p["name"]:"");
+       return nil;
+    });
+    patterns_to_install = filter (string p, patterns_to_install, {
+       return p != nil;
+    });
+    y2milestone ("Patterns to install: %1", patterns_to_install);
+    y2milestone ("Patterns to remove: %1", patterns_to_remove);
+
+    // find out status of packages
+    list<map<string,any> > packages = Pkg::ResolvableProperties ("", `package, 
"");
+    packages = filter (map<string,any> p, packages, {
+       return p["transact_by"]:nil == `user || p["transact_by"]:nil == 
`app_high;
+    });
+
+    list<string> packages_to_remove = [];
+    list<string> packages_to_install = maplist (map<string,any> p, packages, {
+       if (p["status"]:nil == `selected || p["status"]:nil == `installed)
+           return p["name"]:"";
+       else if (p["status"]:nil == `removed || p["status"]:nil == `available)
+           packages_to_remove = add (packages_to_remove, p["name"]:"");
+       return nil;
+    });
+    packages_to_install = filter (string p, packages_to_install, {
+       return p != nil;
+    });
+    y2milestone ("Packages to install: %1", packages_to_install);
+    y2milestone ("Packages to remove: %1", packages_to_remove);
+
+    map software = $[
+       "packages": packages_to_install,
+       "patterns": patterns_to_install,
+        "remove-packages": packages_to_remove,
+        "remove-patterns": patterns_to_remove,
+    ];
+
+    Profile::current["software"] = software;
+    // /root exists during upgrade
+    Profile::Save (Installation::destdir + "/root/autoupg_updated.xml");
+
+
+    return `auto;
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/autoyast2-2.20.3/src/modules/AutoInstall.ycp 
new/autoyast2-2.20.4/src/modules/AutoInstall.ycp
--- old/autoyast2-2.20.3/src/modules/AutoInstall.ycp    2010-10-12 
17:03:26.000000000 +0200
+++ new/autoyast2-2.20.4/src/modules/AutoInstall.ycp    2011-01-19 
15:16:36.000000000 +0100
@@ -4,7 +4,7 @@
  * Summary:    Auto-installation related functions module
  * Author:     Anas Nashif <nashif@xxxxxxx>
  *
- * $Id: AutoInstall.ycp 61896 2010-04-28 12:05:15Z ug $
+ * $Id: AutoInstall.ycp 63230 2011-01-19 14:16:35Z jsrain $
  */
 {
     module "AutoInstall";
@@ -162,7 +162,7 @@
      */
     global define boolean Save()
     {
-        if (Mode::autoinst ())
+        if (Mode::autoinst () || Mode::autoupgrade())
             return (Profile::SaveProfileStructure( 
AutoinstConfig::parsedControlFile ));
         else
             return true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/autoyast2-2.20.3/src/modules/AutoinstConfig.ycp 
new/autoyast2-2.20.4/src/modules/AutoinstConfig.ycp
--- old/autoyast2-2.20.3/src/modules/AutoinstConfig.ycp 2010-10-12 
17:03:26.000000000 +0200
+++ new/autoyast2-2.20.4/src/modules/AutoinstConfig.ycp 2011-01-19 
15:16:36.000000000 +0100
@@ -4,7 +4,7 @@
  * Summary:    This module handles the configuration for auto-installation
  * Authors:    Anas Nashif <nashif@xxxxxxx>
  *
- * $Id: AutoinstConfig.ycp 59453 2009-11-10 10:19:56Z ug $
+ * $Id: AutoinstConfig.ycp 63230 2011-01-19 14:16:35Z jsrain $
  */
 {
     module "AutoinstConfig";
@@ -167,6 +167,11 @@
     //
     global boolean RebootMsg = false;
 
+    //
+    // AutoYaST profile is stored in the root partition (for upgrade)
+    //
+    global boolean ProfileInRootPart = false;
+
 
     //
     // remote profile (invented for pre-probing of s390)
@@ -369,7 +374,7 @@
      */
     global define void AutoinstConfig ()
         ``{
-        if (Mode::autoinst () && Stage::initial() )
+        if ((Mode::autoinst ()|| Mode::autoupgrade ()) && Stage::initial() )
         {
             any autoinstall = SCR::Read(.etc.install_inf.AutoYaST);
             if (autoinstall != nil && is ( autoinstall , string ) )


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

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