October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52695 - in /trunk/theme/openSUSE/icons: 16x16/apps/yast-xen-dirinstall.png 22x22/apps/yast-xen-dirinstall.png 32x32/apps/yast-xen-dirinstall.png 48x48/apps/yast-xen-dirinstall.png
by jimmacfx＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jimmacfx Date: Wed Oct 29 17:08:20 2008 New Revision: 52695 URL: http://svn.opensuse.org/viewcvs/yast?rev=52695&view=rev Log: replace crystal icon Added: trunk/theme/openSUSE/icons/16x16/apps/yast-xen-dirinstall.png (with props) Modified: trunk/theme/openSUSE/icons/22x22/apps/yast-xen-dirinstall.png trunk/theme/openSUSE/icons/32x32/apps/yast-xen-dirinstall.png trunk/theme/openSUSE/icons/48x48/apps/yast-xen-dirinstall.png Added: trunk/theme/openSUSE/icons/16x16/apps/yast-xen-dirinstall.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/16x16/apps/… ============================================================================== Binary file - no diff available. Modified: trunk/theme/openSUSE/icons/22x22/apps/yast-xen-dirinstall.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/32x32/apps/yast-xen-dirinstall.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/48x48/apps/yast-xen-dirinstall.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Binary files - no diff available. -- 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] r52694 - in /trunk/wagon: package/yast2-wagon.changes src/clients/wagon.ycp src/modules/Wagon.ycp
by locilka＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: locilka Date: Wed Oct 29 17:06:23 2008 New Revision: 52694 URL: http://svn.opensuse.org/viewcvs/yast?rev=52694&view=rev Log: - Storing sources when restarting or correctly finishing wagon. Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon.ycp trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Wed Oct 29 17:06:23 2008 @@ -6,6 +6,7 @@ - Remembering and reusing adjusted wagon workflow. - Fixed Provides for PatchCD desktop file - it was owned by yast2-online-update-frontend. +- Storing sources when restarting or correctly finishing wagon. ------------------------------------------------------------------- Mon Oct 27 12:52:02 CET 2008 - locilka(a)suse.cz Modified: trunk/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/clients/wagon.ycp (original) +++ trunk/wagon/src/clients/wagon.ycp Wed Oct 29 17:06:23 2008 @@ -25,6 +25,7 @@ import "Wagon"; import "CommandLine"; import "PackageLock"; + import "PackageCallbacks"; textdomain "wagon"; @@ -90,11 +91,17 @@ y2milestone ("YaST will be restarted starting from the very next step: %1", next_step); SCR::Write (.target.ycp, current_step_file, next_step); + // Also the current workflow type has to be stored string current_workflow = Wagon::GetUpdateWorkflow(); y2milestone ("Current workflow is '%1'", current_workflow); SCR::Write (.target.ycp, current_workflow_file, current_workflow); } } + + if (ret == `restart_same_step || ret == `restart_yast || ret == `reboot || ret == `accept || ret == `next) { + y2milestone ("Storing all the current sources..."); + Pkg::SourceSaveAll(); + } } // Checks whether YaST has been restarted Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Wed Oct 29 17:06:23 2008 @@ -265,8 +265,10 @@ return true; } - map <symbol, integer> update_sum = Pkg::PkgUpdateAll (GetUpdateConf()); - y2milestone ("Update summary: %1", update_sum); + map <string, any> update_conf = GetUpdateConf(); + + map <symbol, integer> update_sum = Pkg::PkgUpdateAll (update_conf); + y2milestone ("Update configuration: %1, update summary: %2", update_conf, update_sum); already_proposed = true; -- 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] r52693 - /tags/branch-SLE-10-SP3-2_13_33/printer/
by mzugec＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: mzugec Date: Wed Oct 29 16:57:04 2008 New Revision: 52693 URL: http://svn.opensuse.org/viewcvs/yast?rev=52693&view=rev Log: Created tag branch-SLE-10-SP3-2_13_33 for printer Added: tags/branch-SLE-10-SP3-2_13_33/printer/ - copied from r52692, branches/SuSE-SLE-10-SP3-Branch/printer/ -- 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] r52692 - /tags/branch-SLE-10-SP3-2_13_33/
by mzugec＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: mzugec Date: Wed Oct 29 16:57:01 2008 New Revision: 52692 URL: http://svn.opensuse.org/viewcvs/yast?rev=52692&view=rev Log: Created tag branch-SLE-10-SP3-2_13_33 Added: tags/branch-SLE-10-SP3-2_13_33/ -- 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] r52691 - in /branches/SuSE-SLE-10-SP3-Branch/printer: VERSION package/yast2-printer.changes src/modules/Printerlib.ycp
by mzugec＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: mzugec Date: Wed Oct 29 16:56:50 2008 New Revision: 52691 URL: http://svn.opensuse.org/viewcvs/yast?rev=52691&view=rev Log: correct parsing of socket URI (bnc#431209) Modified: branches/SuSE-SLE-10-SP3-Branch/printer/VERSION branches/SuSE-SLE-10-SP3-Branch/printer/package/yast2-printer.changes branches/SuSE-SLE-10-SP3-Branch/printer/src/modules/Printerlib.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/printe… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/printer/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/printer/VERSION Wed Oct 29 16:56:50 2008 @@ -1 +1 @@ -2.13.32 +2.13.33 Modified: branches/SuSE-SLE-10-SP3-Branch/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/printe… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/printer/package/yast2-printer.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/printer/package/yast2-printer.changes Wed Oct 29 16:56:50 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 29 17:54:47 CET 2008 - mzugec(a)suse.de + +- correct parsing of socket URI (bnc#431209) +- 2.14.33 + +------------------------------------------------------------------- Tue Jan 16 17:35:32 CET 2007 - mzugec(a)suse.de - #215251 - unpacked schema files (printer.rnc) Modified: branches/SuSE-SLE-10-SP3-Branch/printer/src/modules/Printerlib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/printe… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/printer/src/modules/Printerlib.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/printer/src/modules/Printerlib.ycp Wed Oct 29 16:56:50 2008 @@ -554,6 +554,10 @@ if (size (uri_list) >= 3) return uri_list[1]:""; } + else if(getUriType(uri)=="socket"){ + list<string> uri_list=splitstring(dev, ":"); + return uri_list[0]:""; + } /* i = findfirstof (dev, "/"); if (nil != i) -- 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] r52690 - in /trunk/theme/openSUSE/icons: 22x22/apps/ 32x32/apps/ 48x48/apps/
by jimmacfx＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jimmacfx Date: Wed Oct 29 16:56:26 2008 New Revision: 52690 URL: http://svn.opensuse.org/viewcvs/yast?rev=52690&view=rev Log: use same metaphor as what openSUSE-Oxygen does Modified: trunk/theme/openSUSE/icons/22x22/apps/yast-remotechooser.png (contents, props changed) trunk/theme/openSUSE/icons/22x22/apps/yast-remoteinstall.png (contents, props changed) trunk/theme/openSUSE/icons/32x32/apps/yast-remotechooser.png (contents, props changed) trunk/theme/openSUSE/icons/32x32/apps/yast-remoteinstall.png (contents, props changed) trunk/theme/openSUSE/icons/48x48/apps/yast-remotechooser.png (contents, props changed) trunk/theme/openSUSE/icons/48x48/apps/yast-remoteinstall.png (contents, props changed) Modified: trunk/theme/openSUSE/icons/22x22/apps/yast-remotechooser.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/22x22/apps/yast-remoteinstall.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/32x32/apps/yast-remotechooser.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/32x32/apps/yast-remoteinstall.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/48x48/apps/yast-remotechooser.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/48x48/apps/yast-remoteinstall.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Binary files - no diff available. -- 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] r52689 - in /trunk/support: package/yast2-support.changes src/Support.ycp src/dialogs.ycp
by jsrain＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jsrain Date: Wed Oct 29 16:56:14 2008 New Revision: 52689 URL: http://svn.opensuse.org/viewcvs/yast?rev=52689&view=rev Log: fixed passing root password to supportconfig if YaST is run as non-root Modified: trunk/support/package/yast2-support.changes trunk/support/src/Support.ycp trunk/support/src/dialogs.ycp Modified: trunk/support/package/yast2-support.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/package/yast2-support.ch… ============================================================================== --- trunk/support/package/yast2-support.changes (original) +++ trunk/support/package/yast2-support.changes Wed Oct 29 16:56:14 2008 @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Wed Oct 29 14:52:50 CET 2008 - jsrain(a)suse.cz +Wed Oct 29 16:55:40 CET 2008 - jsrain(a)suse.cz - issue a warning before starting browser as root +- fixed passing root password to supportconfig if YaST is run as + non-root ------------------------------------------------------------------- Wed Oct 29 14:07:23 CET 2008 - mzugec(a)suse.de Modified: trunk/support/src/Support.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/Support.ycp?rev=5268… ============================================================================== --- trunk/support/src/Support.ycp (original) +++ trunk/support/src/Support.ycp Wed Oct 29 16:56:14 2008 @@ -74,14 +74,16 @@ */ global string root_pw = nil; -global string pwd_pipe = nil; +global string pwd_file = nil; global boolean CheckRootPw (string pw) { - if (pwd_pipe == nil) - pwd_pipe = ((string)SCR::Read (.target.tmpdir) + "/pwd_pipe"); - SCR::Execute (.target.bash, "test -e %1 || mkfifo %1", pwd_pipe); - SCR::Write (.target.string, pwd_pipe, pw + "\n"); - integer exit = (integer)SCR::Execute (.target.bash, sformat ("cat %1 | su -c 'echo 0'", pwd_pipe)); + if (pwd_file == nil) + pwd_file = ((string)SCR::Read (.target.tmpdir) + "/pwd_file"); + SCR::Execute (.target.bash, sformat ("test -e %1 || touch %1", pwd_file)); + SCR::Execute (.target.bash, sformat ("chmod 600 %1", pwd_file)); + SCR::Write (.target.string, pwd_file, pw + "\n"); + integer exit = (integer)SCR::Execute (.target.bash, sformat ("cat %1 | su -c 'echo 0'", pwd_file)); + SCR::Write (.target.string, pwd_file, ""); boolean success = (exit == 0); y2milestone ("Root password check: %1", success); if (success) Modified: trunk/support/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/dialogs.ycp?rev=5268… ============================================================================== --- trunk/support/src/dialogs.ycp (original) +++ trunk/support/src/dialogs.ycp Wed Oct 29 16:56:14 2008 @@ -196,12 +196,14 @@ if (! Support::AskForRootPwd()) return `back; integer id = Support::WhoAmI(); - SCR::Write (.target.string, Support::pwd_pipe, Support::root_pw + "\n"); - command = sformat("cat %2 | su -c '%1'", command, Support::pwd_pipe); + SCR::Write (.target.string, Support::pwd_file, Support::root_pw + "\n"); + command = sformat("cat %2 | su -c '%1'", command, Support::pwd_file); } y2milestone("executing %1", command); map<string, any> output = (map<string, any>)SCR::Execute(.target.bash_output, command); y2milestone("output %1", output); + if (Support::WhoAmI() != 0) + SCR::Write (.target.string, Support::pwd_file, ""); if (output["exit"]:-1 != 0) Report::Error (sformat("%1 : %2",_("Cannot write settings"), output)); else{ command = sformat("find \"%1\" -type f -name \"%2*\"|tr -d '\n'", Support::log_files["tmp_dir"]:"", Support::log_files["log_dir"]:""); @@ -534,8 +536,8 @@ if (! Support::AskForRootPwd()) return `back; integer id = Support::WhoAmI(); - SCR::Write (.target.string, Support::pwd_pipe, Support::root_pw + "\n"); - cmd = sformat("cat %4 | su -c 'supportconfig %1 -t %2 && chown -R %3 %2'", Support::GetParameterList(), Support::log_files["tmp_dir"]:"", id, Support::pwd_pipe); + SCR::Write (.target.string, Support::pwd_file, Support::root_pw + "\n"); + cmd = sformat("cat %4 | su -c 'supportconfig %1 -t %2 && chown -R %3 %2'", Support::GetParameterList(), Support::log_files["tmp_dir"]:"", id, Support::pwd_file); } symbol ret = nil; integer pid = (integer) SCR::Execute(.process.start_shell, cmd); @@ -558,6 +560,8 @@ break; } } + if (Support::WhoAmI() != 0) + SCR::Write (.target.string, Support::pwd_file, ""); while(ret!=`back && ret!=`abort && ret!=`next){ ret = (symbol)UI::UserInput(); } -- 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] r52688 - in /trunk/wagon: package/yast2-wagon.changes yast2-wagon.spec.in
by locilka＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: locilka Date: Wed Oct 29 16:48:41 2008 New Revision: 52688 URL: http://svn.opensuse.org/viewcvs/yast?rev=52688&view=rev Log: - Fixed Provides for PatchCD desktop file - it was owned by yast2-online-update-frontend. Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/yast2-wagon.spec.in Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Wed Oct 29 16:48:41 2008 @@ -4,6 +4,8 @@ - Restarting the very next step instead of the same step in case of restarting wagon after self-update (prevents from loop). - Remembering and reusing adjusted wagon workflow. +- Fixed Provides for PatchCD desktop file - it was owned by + yast2-online-update-frontend. ------------------------------------------------------------------- Mon Oct 27 12:52:02 CET 2008 - locilka(a)suse.cz Modified: trunk/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/yast2-wagon.spec.in?rev=52… ============================================================================== --- trunk/wagon/yast2-wagon.spec.in (original) +++ trunk/wagon/yast2-wagon.spec.in Wed Oct 29 16:48:41 2008 @@ -3,10 +3,10 @@ @HEADER@ # Possibility to restart YaST Requires: yast2 >= 2.17.33 -Requires: yast2-online-update >= 2.17.9 +Requires: yast2-online-update-frontend >= 2.17.9 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update -Provides: yast2-online-update:/usr/share/applications/YaST2/cd_update.desktop +Provides: yast2-online-update-frontend:/usr/share/applications/YaST2/cd_update.desktop BuildArchitectures: noarch -- 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] r52687 - in /trunk/wagon: package/yast2-wagon.changes src/clients/wagon.ycp src/clients/wagon_selfupdate.ycp src/clients/wagon_update_proposal.ycp
by locilka＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: locilka Date: Wed Oct 29 16:43:09 2008 New Revision: 52687 URL: http://svn.opensuse.org/viewcvs/yast?rev=52687&view=rev Log: - Restarting the very next step instead of the same step in case of restarting wagon after self-update (prevents from loop). - Remembering and reusing adjusted wagon workflow. Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon.ycp trunk/wagon/src/clients/wagon_selfupdate.ycp trunk/wagon/src/clients/wagon_update_proposal.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Wed Oct 29 16:43:09 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 29 16:41:12 CET 2008 - locilka(a)suse.cz + +- Restarting the very next step instead of the same step in case of + restarting wagon after self-update (prevents from loop). +- Remembering and reusing adjusted wagon workflow. + +------------------------------------------------------------------- Mon Oct 27 12:52:02 CET 2008 - locilka(a)suse.cz - Calling inst_prepareprogress before inst_kickoff (bnc #438848). Modified: trunk/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/clients/wagon.ycp (original) +++ trunk/wagon/src/clients/wagon.ycp Wed Oct 29 16:43:09 2008 @@ -45,7 +45,11 @@ string do_restart = Directory::vardir + "/restart_yast"; - string current_step_file = Directory::vardir + "/current_workflow_step"; + // Start workflow from step ... + string current_step_file = Directory::vardir + "/wagon-current_workflow_step"; + // Start with workflow + string current_workflow_file = Directory::vardir + "/wagon-current_workflow_file"; + integer current_step = 0; string custom_workflow_file = "/usr/share/YaST2/control/online_migration.xml"; @@ -78,8 +82,17 @@ if (ret == `restart_same_step) { current_step = ProductControl::CurrentStep(); - y2milestone ("The same step will be restarted: %1", current_step); - SCR::Write (.target.ycp, current_step_file, current_step); + // We actually don't want to restart the same step, we want to continue + // directly with the very next step + // + // The current step + 1 == the very next step + integer next_step = current_step + 1; + y2milestone ("YaST will be restarted starting from the very next step: %1", next_step); + SCR::Write (.target.ycp, current_step_file, next_step); + + string current_workflow = Wagon::GetUpdateWorkflow(); + y2milestone ("Current workflow is '%1'", current_workflow); + SCR::Write (.target.ycp, current_workflow_file, current_workflow); } } } @@ -102,6 +115,18 @@ y2milestone ("Adjusting starting step: %1", current_step); } } + + if (FileUtils::Exists (current_workflow_file)) { + string workflow_type = (string) SCR::Read (.target.ycp, current_workflow_file); + SCR::Execute (.target.remove, current_workflow_file); + + if (workflow_type == nil || workflow_type == "") { + y2error ("Requested workflow type is invalid: %1", workflow_type); + } else { + y2milestone ("Adjusting required workflow type: %1", workflow_type); + Wagon::SetUpdateWorkflow (workflow_type); + } + } } } Modified: trunk/wagon/src/clients/wagon_selfupdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_selfupda… ============================================================================== --- trunk/wagon/src/clients/wagon_selfupdate.ycp (original) +++ trunk/wagon/src/clients/wagon_selfupdate.ycp Wed Oct 29 16:43:09 2008 @@ -164,6 +164,7 @@ } } + y2milestone ("Selected resolvables: %1", selected); if (selected < 1) { y2milestone ("Neither patches nor packages for self-update have been selected"); return ret; @@ -178,10 +179,12 @@ // PkgSolve didn't report any problem if (solved) { + y2milestone ("Solved automatically"); // FIXME: inform user? ret = `restart_same_step; // There are some issues in selecting the patches } else { + y2milestone ("Cannot be solved automatically"); while (true) { // Try to solve them manually UI::OpenDialog(`opt(`defaultsize), `PackageSelector (`id(`selector), `opt(`summaryMode))); @@ -209,7 +212,7 @@ } // Solved manually } else if (ret_sel == `accept) { - ret = `restart_same_step; + solved = true; break; } } @@ -228,11 +231,20 @@ } if (solved == true) { - y2milestone ("Calling update..."); - OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); - any ret = WFM::call ("online_update_install"); - y2milestone ("Update returned: %1", ret); + // Solver ends with some resolvables changed + if (Pkg::IsAnyResolvable (`any, `to_install) == true || Pkg::IsAnyResolvable (`any, `to_remove) == true) { + y2milestone ("Calling update..."); + OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); + any oui_ret = WFM::call ("online_update_install"); + y2milestone ("Update returned: %1", oui_ret); + ret = `restart_same_step; + } else { + y2milestone ("Nothing to install/remove"); + ret = `auto; + } } + y2milestone ("Returning: %1", ret); + return ret; } Modified: trunk/wagon/src/clients/wagon_update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_update_p… ============================================================================== --- trunk/wagon/src/clients/wagon_update_proposal.ycp (original) +++ trunk/wagon/src/clients/wagon_update_proposal.ycp Wed Oct 29 16:43:09 2008 @@ -26,6 +26,9 @@ map <string, any> ret = $[]; if (func == "MakeProposal") { + // Make sure the packager is initialized + Wagon::InitPkg(); + boolean force_reset = param["force_reset" ]:false; boolean language_changed = param["language_changed"]:false; -- 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] r52686 - /trunk/gtk/yast2-gtk.spec.in
by michael_meeks＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: michael_meeks Date: Wed Oct 29 16:37:13 2008 New Revision: 52686 URL: http://svn.opensuse.org/viewcvs/yast?rev=52686&view=rev Log: package the artwork too Modified: trunk/gtk/yast2-gtk.spec.in Modified: trunk/gtk/yast2-gtk.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/yast2-gtk.spec.in?rev=52686&… ============================================================================== --- trunk/gtk/yast2-gtk.spec.in (original) +++ trunk/gtk/yast2-gtk.spec.in Wed Oct 29 16:37:13 2008 @@ -61,5 +61,5 @@ %doc @docdir@ %{_libdir}/YaST2/plugin/libpy2gtk.so.* %{_libdir}/YaST2/plugin/libpy2gtk.so - - +%{_datadir}/YaST2/gtk/*.png +%{_datadir}/YaST2/gtk/*.xpm -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0