July 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r62228 - /trunk/qt-pkg/src/YQPkgPatternList.cc
by dmacvicar＠svn.opensuse.org 13 Jul '10

13 Jul '10

Author: dmacvicar Date: Tue Jul 13 15:52:50 2010 New Revision: 62228 URL: http://svn.opensuse.org/viewcvs/yast?rev=62228&view=rev Log: bnc#621649 patterns with no categories were supposed to be displayed at the top, not randomly Modified: trunk/qt-pkg/src/YQPkgPatternList.cc Modified: trunk/qt-pkg/src/YQPkgPatternList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPatternList.cc?r… ============================================================================== --- trunk/qt-pkg/src/YQPkgPatternList.cc (original) +++ trunk/qt-pkg/src/YQPkgPatternList.cc Tue Jul 13 15:52:50 2010 @@ -651,7 +651,7 @@ const YQPkgPatternListItem * otherPatternListitem = dynamic_cast<const YQPkgPatternListItem *>(&otherListViewItem); if ( otherPatternListitem ) // Patterns without category should always be sorted - return true; // before any category + return false; // before any category return QTreeWidgetItem::operator<( otherListViewItem ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62227 - /tags/stable-2_21_65/gtk/
by rpmcruz＠svn.opensuse.org 12 Jul '10

12 Jul '10

Author: rpmcruz Date: Mon Jul 12 16:33:25 2010 New Revision: 62227 URL: http://svn.opensuse.org/viewcvs/yast?rev=62227&view=rev Log: Created tag stable-2_21_65 for gtk Added: tags/stable-2_21_65/gtk/ - copied from r62226, trunk/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62226 - /tags/stable-2_21_65/
by rpmcruz＠svn.opensuse.org 12 Jul '10

12 Jul '10

Author: rpmcruz Date: Mon Jul 12 16:33:18 2010 New Revision: 62226 URL: http://svn.opensuse.org/viewcvs/yast?rev=62226&view=rev Log: Created tag stable-2_21_65 Added: tags/stable-2_21_65/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62225 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn.opensuse.org 12 Jul '10

12 Jul '10

Author: rpmcruz Date: Mon Jul 12 16:33:15 2010 New Revision: 62225 URL: http://svn.opensuse.org/viewcvs/yast?rev=62225&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=62225&r1=62224&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Mon Jul 12 16:33:15 2010 @@ -1 +1 @@ -2.21.64 +2.21.65 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=62225&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Mon Jul 12 16:33:15 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "64") +SET(VERSION_PATCH "65") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Mon Jul 12 16:33:15 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 12 15:32:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.65 +- more comsmetic fixes related to bnc#620513. + +------------------------------------------------------------------- Sat Jul 10 21:56:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.64 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62224 - in /trunk/gtk: ChangeLog src/pkg/ygtkpkgdetailview.cc
by rpmcruz＠svn.opensuse.org 12 Jul '10

12 Jul '10

Author: rpmcruz Date: Mon Jul 12 16:32:13 2010 New Revision: 62224 URL: http://svn.opensuse.org/viewcvs/yast?rev=62224&view=rev Log: * src/pkg/ygtkpkgdetailview.cc: more italic work. Modified: trunk/gtk/ChangeLog trunk/gtk/src/pkg/ygtkpkgdetailview.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=62224&r1=62223… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Mon Jul 12 16:32:13 2010 @@ -5,6 +5,8 @@ the usage og bold fonts within the details box by italic ones. + * src/pkg/ygtkpkgdetailview.cc: more italic work. + 2010-07-10 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/ygtkpkgdetailview.cc & src/ygtkrichtext.c: Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgdetailview.cc… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgdetailview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgdetailview.cc Mon Jul 12 16:32:13 2010 @@ -154,15 +154,15 @@ Ypp::Package pkg (sel); std::string url (pkg.url()); if (!url.empty()) { - str += ""; str += _("Web site:"); - str += " <a href=\""; str += url; str += "\">"; + str += ""; str += _("Web site:"); + str += " <a href=\""; str += url; str += "\">"; str += url; str += "</a>"; } if (pkg.isCandidatePatch()) { Ypp::Selectable _patch = pkg.getCandidatePatch(); Ypp::Patch patch (_patch); - str += ""; str += _("Patch issued:"); - str += " "; str += _patch.summary(); + str += ""; str += _("Patch issued:"); + str += " "; str += _patch.summary(); str += " ("; str += Ypp::Patch::prioritySummary (patch.priority()); str += ")"; str += ""; @@ -339,7 +339,7 @@ ZyppPackage zpkg = castZyppPackage (zobj); std::string str; - std::string b (""), _b (" "), i (""), _i(""), br (" "); + std::string b (""), _b (" "), i (""), _i(""), br (" "); str.reserve (2048); str += b + _("Size:") + _b + i + zobj->installSize().asString() + _i; str += br + b + _("License:") + _b + i + zpkg->license() + _i; @@ -718,7 +718,7 @@ col = ygtk_rich_text_new(); gtk_widget_set_size_request (col, 100, -1); ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), - ("" + col1 + "").c_str()); + ("" + col1 + "").c_str()); gtk_box_pack_start (GTK_BOX (hbox), col, FALSE, TRUE, 0); // by settings both the two following "col" text widgets with the same // fixed width, and expanded=True, we ensure all rows have the same size @@ -760,8 +760,8 @@ Ypp::Selectable sel = list.get (0); clear(); - std::string installed_str (_("Installed Version")); - std::string candidate_str (_("Available Version")); + std::string installed_str (_("Installed Version")); + std::string candidate_str (_("Available Version")); if (sel.hasInstalledVersion()) installed_str += " " + sel.installed().number(); if (sel.hasCandidateVersion()) @@ -1028,7 +1028,7 @@ YGUtils::replace (changes, "\n", 1, " "); if (author.compare (0, 2, "- ", 2) == 0) // zypp returns a lot of author strings as author.erase (0, 2); // "- author". wtf? - text += date + " (" + author + "): <blockquote>" + changes + "</blockquote>"; + text += "" + date + " (" + author + "): <blockquote>" + changes + "</blockquote>"; } } return text; @@ -1104,9 +1104,10 @@ } if (!authors.empty()) { - text = _("Developed by:") + ("<blockquote>" + authors) + "</blockquote>"; + text = ""; text += _("Developed by:"); text += ""; + text += ("<blockquote>" + authors) + "</blockquote>"; if (!packager.empty() || !vendor.empty()) { - text += _("Packaged by:"); + text += ""; text += _("Packaged by:"); text += ""; text += "<blockquote>"; if (!packager.empty()) text += packager + " "; if (!vendor.empty()) text += "(" + vendor + ")"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62223 - in /trunk/gtk: ChangeLog src/pkg/ygtkpkgdetailview.cc
by rpmcruz＠svn.opensuse.org 12 Jul '10

12 Jul '10

Author: rpmcruz Date: Mon Jul 12 15:27:33 2010 New Revision: 62223 URL: http://svn.opensuse.org/viewcvs/yast?rev=62223&view=rev Log: * src/pkg/ygtkpkgdetailview.cc: as suggested by Atri, to address bug 620513's usability complaint, replaced the usage og bold fonts within the details box by italic ones. Modified: trunk/gtk/ChangeLog trunk/gtk/src/pkg/ygtkpkgdetailview.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=62223&r1=62222… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Mon Jul 12 15:27:33 2010 @@ -1,3 +1,10 @@ +2010-07-12 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/ygtkpkgdetailview.cc: as suggested by Atri, + to address bug 620513's usability complaint, replaced + the usage og bold fonts within the details box by + italic ones. + 2010-07-10 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/ygtkpkgdetailview.cc & src/ygtkrichtext.c: Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgdetailview.cc… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgdetailview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgdetailview.cc Mon Jul 12 15:27:33 2010 @@ -339,16 +339,16 @@ ZyppPackage zpkg = castZyppPackage (zobj); std::string str; - std::string b (""), _b (" "), br (" "); + std::string b (""), _b (" "), i (""), _i(""), br (" "); str.reserve (2048); - str += b + _("Size:") + _b + zobj->installSize().asString(); - str += br + b + _("License:") + _b + zpkg->license(); + str += b + _("Size:") + _b + i + zobj->installSize().asString() + _i; + str += br + b + _("License:") + _b + i + zpkg->license() + _i; if (zsel->hasInstalledObj()) - str += br + b + ("Installed at:") + _b + - zsel->installedObj()->installtime().form ("%x"); + str += br + b + ("Installed at:") + _b + i + + zsel->installedObj()->installtime().form ("%x") + _i; if (zsel->hasCandidateObj()) - str += br + b + ("Latest build:") + _b + - zsel->candidateObj()->buildtime().form ("%x"); + str += br + b + ("Latest build:") + _b + i + + zsel->candidateObj()->buildtime().form ("%x") + _i; ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str()); } @@ -720,8 +720,10 @@ ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), ("" + col1 + "").c_str()); gtk_box_pack_start (GTK_BOX (hbox), col, FALSE, TRUE, 0); + // by settings both the two following "col" text widgets with the same + // fixed width, and expanded=True, we ensure all rows have the same size col = ygtk_rich_text_new(); - gtk_widget_set_size_request (col, 1, -1); + gtk_widget_set_size_request (col, 80, -1); ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), col2.c_str()); if (dep == 0) g_signal_connect (G_OBJECT (col), "link-clicked", @@ -731,7 +733,7 @@ G_CALLBACK (provides_link_cb), NULL); gtk_box_pack_start (GTK_BOX (hbox), col, TRUE, TRUE, 0); col = ygtk_rich_text_new(); - gtk_widget_set_size_request (col, 1, -1); + gtk_widget_set_size_request (col, 80, -1); ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), col3.c_str()); if (dep == 0) g_signal_connect (G_OBJECT (col), "link-clicked", -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62222 - in /branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients: Makefile.am autoinst_scripts1_finish.ycp autoinst_scripts2_finish.ycp inst_autoinit.ycp inst_autosetup_upgrade.ycp
by jsrain＠svn.opensuse.org 12 Jul '10

12 Jul '10

Author: jsrain Date: Mon Jul 12 13:56:35 2010 New Revision: 62222 URL: http://svn.opensuse.org/viewcvs/yast?rev=62222&view=rev Log: adjustments for autoupgrade Added: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/Makefile.am branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts1_finish.ycp branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts2_finish.ycp branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autoinit.ycp Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/Makefile.am (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/Makefile.am Mon Jul 12 13:56:35 2010 @@ -13,6 +13,7 @@ inst_autoinit.ycp \ inst_autopost.ycp \ inst_autosetup.ycp \ + inst_autosetup_upgrade.ycp \ report_auto.ycp \ scripts_auto.ycp \ software_auto.ycp \ Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts1_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts1_finish.ycp (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts1_finish.ycp Mon Jul 12 13:56:35 2010 @@ -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") Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts2_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts2_finish.ycp (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts2_finish.ycp Mon Jul 12 13:56:35 2010 @@ -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") Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autoinit.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autoinit.ycp (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autoinit.ycp Mon Jul 12 13:56:35 2010 @@ -23,6 +23,7 @@ // import "Arch"; import "Call"; import "Console"; + import "Mode"; import "Popup"; @@ -165,10 +166,21 @@ } 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/autoupg.xml"); + AutoinstConfig::ProfileInRootPart = true; + } + symbol ret = processProfile(); if( ret != `ok ) { return ret; Added: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp (added) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp Mon Jul 12 13:56:35 2010 @@ -0,0 +1,421 @@ +/** + * File: clients/inst_autosetup.ycp + * Package: Auto-installation + * Summary: Setup and prepare system for auto-installation + * Authors: Anas Nashif <nashif(a)suse.de> + * Uwe Gansert <ug(a)suse.de> + * + * $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 = _("Please wait while the system is prepared for autoinstallation."); + 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; + } + } + + // 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 (); + + } + + + AutoInstall::TurnOff(); + Progress::Finish(); + + symbol ret = ProductControl::RunFrom ( ProductControl::CurrentStep () + 1, true); + if (ret == `next) + return `finish; + return ret; +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62221 - in /branches/tmp/jsrain/unattended-migration/installation/src: clients/inst_finish.ycp clients/inst_proposal.ycp clients/inst_worker_initial.ycp include/inst_inc_all.ycp
by jsrain＠svn.opensuse.org 12 Jul '10

12 Jul '10

Author: jsrain Date: Mon Jul 12 13:52:46 2010 New Revision: 62221 URL: http://svn.opensuse.org/viewcvs/yast?rev=62221&view=rev Log: added handling of autoupgrade Modified: branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_finish.ycp branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_proposal.ycp branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_worker_initial.ycp branches/tmp/jsrain/unattended-migration/installation/src/include/inst_inc_all.ycp Modified: branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_finish.ycp (original) +++ branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_finish.ycp Mon Jul 12 13:52:46 2010 @@ -243,7 +243,10 @@ return nil; } - if (info["when"]:nil != nil && ! contains (info["when"]:[], run_type)) + if (info["when"]:nil != nil && ! contains (info["when"]:[], run_type) && + // special hack for autoupgrade - should be as regular upgrade as possible, scripts are the only exception + (!(Mode::autoupgrade() && contains (info["when"]:[], `autoupg))) + ) return nil; y2milestone ("inst_finish client %1 will be called", s); Modified: branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_proposal.ycp (original) +++ branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_proposal.ycp Mon Jul 12 13:52:46 2010 @@ -65,7 +65,7 @@ symbol proposal_result = nil; // skip if not interactive mode. - if (!AutoinstConfig::Confirm && Mode::autoinst ()) { + if (!AutoinstConfig::Confirm && (Mode::autoinst () || Mode::autoupgrade ())) { return `auto; } Modified: branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_worker_initial.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_worker_initial.ycp (original) +++ branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_worker_initial.ycp Mon Jul 12 13:52:46 2010 @@ -44,6 +44,7 @@ // All stages SetAutoinstHandling (); + SetAutoupgHandling (); SetGlobalInstallationFeatures (); // Initial stage Modified: branches/tmp/jsrain/unattended-migration/installation/src/include/inst_inc_all.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/installation/src/include/inst_inc_all.ycp (original) +++ branches/tmp/jsrain/unattended-migration/installation/src/include/inst_inc_all.ycp Mon Jul 12 13:52:46 2010 @@ -101,6 +101,19 @@ Report::DisplayMessages(true, 10); } + /** + * Sets autoupgrade behavior + */ + void SetAutoupgHandling () { + // if profile is defined, first read it, then probe hardware + any autoinstall = SCR::Read(.etc.install_inf.AutoYaST); + if (autoinstall != nil && is ( autoinstall , string ) && (string)autoinstall != "") + { + ProductControl::DisableModule ("system_analysis"); + ProductControl::DisableModule ("update_partition_auto"); + } + } + void ShowTextFallbackMessage () { if ( (Installation::text_fallback () || Installation::no_x11 ()) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62220 - /branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml
by jsrain＠svn.opensuse.org 12 Jul '10

12 Jul '10

Author: jsrain Date: Mon Jul 12 13:51:56 2010 New Revision: 62220 URL: http://svn.opensuse.org/viewcvs/yast?rev=62220&view=rev Log: defined autoupgrade workflow Modified: branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml Modified: branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml (original) +++ branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml Mon Jul 12 13:51:56 2010 @@ -534,7 +534,7 @@ <proposal> <label>Installation Settings</label> - <mode>update</mode> + <mode>update,autoupgrade</mode> <stage>initial</stage> <name>initial</name> <enable_skip>no</enable_skip> @@ -1462,6 +1462,139 @@ <workflow> <defaults> <archs>all</archs> + </defaults> + <label>Preparation</label> + <mode>autoupgrade</mode> + <stage>initial</stage> + <modules config:type="list"> + + <module> + <label>System Analysis</label> + <name>system_analysis</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>System for Update</label> + <name>update_partition_auto</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autoinit</name> + <archs>all</archs> + <retranslate config:type="boolean">true</retranslate> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autosetup_upgrade</name> + </module> + + + <module> + <heading>yes</heading> + <label>Update</label> + </module> + + + <module> + <label>AutoYaST Settings</label> + <name>initial_update_proposal</name> + <execute>inst_proposal</execute> + <proposal>initial</proposal> + <enable_back>no</enable_back> + <enable_next>yes</enable_next> + </module> + +  + <module> + <label>Perform Update</label> + <name>bl_preupdate</name> + <execute>bootloader_preupdate</execute> + </module> +  + <module> + <label>Perform Update</label> + <name>prepareprogress</name> + </module> + + <module> + <label>Perform Update</label> + <name>do_resize</name> + <update config:type="boolean">false</update> + <archs>i386,x86_64,ia64</archs> + </module> + <module> + <label>Perform Update</label> + <name>prepdisk</name> + </module> + <module> + <label>Perform Update</label> + <name>kickoff</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy</name> + </module> + <module> +  + <label>Perform Update</label> + <name>reiplauto</name> + <archs>s390</archs> + </module> + <module> + <label>Perform Update</label> + <name>finish</name> + </module> + </modules> + </workflow> + + + <workflow> + <defaults> + <archs>all</archs> <enable_back>no</enable_back> <enable_next>no</enable_next> </defaults> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62219 - /tags/stable-2_21_64/gtk/
by rpmcruz＠svn.opensuse.org 10 Jul '10

10 Jul '10

Author: rpmcruz Date: Sat Jul 10 22:57:35 2010 New Revision: 62219 URL: http://svn.opensuse.org/viewcvs/yast?rev=62219&view=rev Log: Created tag stable-2_21_64 for gtk Added: tags/stable-2_21_64/gtk/ - copied from r62218, trunk/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0