November 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r59865 - in /branches/SuSE-Code-11-SP1-Branch/live-installer: package/yast2-live-installer.changes src/inst_live_doit.ycp src/live-installer.ycp src/live_save_config_finish.ycp
by jsrain＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: jsrain Date: Mon Nov 30 17:40:39 2009 New Revision: 59865 URL: http://svn.opensuse.org/viewcvs/yast?rev=59865&view=rev Log: backported from trunk Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp branches/SuSE-Code-11-SP1-Branch/live-installer/src/live-installer.ycp branches/SuSE-Code-11-SP1-Branch/live-installer/src/live_save_config_finish.ycp Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes Mon Nov 30 17:40:39 2009 @@ -1,6 +1,9 @@ ------------------------------------------------------------------- -Thu Jun 11 13:40:23 CEST 2009 - jsrain(a)suse.cz +Mon Nov 30 17:34:35 CET 2009 - jsrain(a)suse.cz +- call correct_live_for_reboot script before reboot (bnc#550874) +- enhanced error reporting (bnc#533601) +- fixed calling the workflow modules (bnc#532502) - disable all repos before installation, reenable afterwards (bnc #450228) - adapted for unified progress during live installation Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp Mon Nov 30 17:40:39 2009 @@ -12,6 +12,7 @@ import "ImageInstallation"; import "LiveInstaller"; import "SlideShow"; +import "Report"; Installation::destdir = "/mnt"; @@ -71,6 +72,7 @@ } integer index = 0; integer progress_step = (100-progress_start) * index / size (symlinks); + boolean ret = true; foreach (string link, string target, symlinks, { index = index + 1; SlideShow::StageProgress( progress_start, nil); @@ -90,13 +92,13 @@ link = mergestring (components, "/"); */ integer progress_done = progress_start + progress_step; - ImageInstallation::FileSystemCopy ("/" + target, sformat ("%1/%2", Installation::destdir, link), progress_start, progress_done); + ret = ImageInstallation::FileSystemCopy ("/" + target, sformat ("%1/%2", Installation::destdir, link), progress_start, progress_done) && ret; progress_start = progress_done; // Progress::Step (progress_start); SlideShow::StageProgress( progress_done, nil); SlideShow::SubProgress( 100, nil); }); - return true; + return ret; } /** @@ -106,9 +108,9 @@ boolean CopyRootImage (integer progress_start, integer progress_finish) { string tmpdir = (string)SCR::Read (.target.tmpdir); SCR::Execute (.target.bash, sformat ("/bin/cp -a %1/etc %2", Installation::destdir, tmpdir)); - ImageInstallation::FileSystemCopy ("/", Installation::destdir, progress_start, progress_finish); + boolean ret = ImageInstallation::FileSystemCopy ("/", Installation::destdir, progress_start, progress_finish); SCR::Execute (.target.bash, sformat ("/bin/cp -a %1/etc %2", tmpdir, Installation::destdir)); - return true; + return ret; } /* Progress::New( @@ -141,9 +143,19 @@ integer steps = size (copy_map) + 1; integer step_size = 95 / steps; -CopyRootImage (5, 5 + step_size); +if (! CopyRootImage (5, 5 + step_size)) +{ + // error report + Report::Error (_("Copying the live image to hard disk failed.")); + return `abort; +} //Progress::NextStageStep (10); -CopySymlinkedImage (copy_map, 5 + step_size); +if (! CopySymlinkedImage (copy_map, 5 + step_size)) +{ + // error report + Report::Error (_("Copying the live image to hard disk failed.")); + return `abort; +} //Progress::Finish(); //Progress::Title (_("Finished.")); Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/src/live-installer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/live-installer/src/live-installer.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/live-installer/src/live-installer.ycp Mon Nov 30 17:40:39 2009 @@ -18,8 +18,6 @@ import "CommandLine"; import "Popup"; - string live_control_file = "/etc/YaST2/control-live.xml"; - // Bugzilla #269890, CommanLine "support" // argmap is only a map, CommandLine uses string parameters if (size (WFM::Args()) > 0) { @@ -31,9 +29,8 @@ } Wizard::OpenNextBackStepsDialog(); - - if ($[] != (map)SCR::Read (.target.stat, live_control_file)) { - ProductControl::custom_control_file = live_control_file; + if ($[] != (map)SCR::Read (.target.stat, LiveInstaller::live_control_file)) { + ProductControl::custom_control_file = LiveInstaller::live_control_file; // replace general control file because of 2nd stage integer cpres = (integer)SCR::Execute (.target.bash, sformat ("/bin/cp %1 %2", live_control_file, "/etc/YaST2/control.xml")); if (cpres != 0) Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/src/live_save_config_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/live-installer/src/live_save_config_finish.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/live-installer/src/live_save_config_finish.ycp Mon Nov 30 17:40:39 2009 @@ -21,6 +21,7 @@ import "Keyboard"; import "Installation"; import "Language"; +import "FileUtils"; any ret = nil; string func = ""; @@ -64,6 +65,23 @@ Progress::Title (_("Saving time zone...")); Timezone::Save(); + // bnc#550874 + // Call a script if it exists + string scriptname = "/usr/bin/correct_live_for_reboot"; + if (FileUtils::Exists (scriptname)) { + y2milestone ("Calling %1 returned %2", + scriptname, + SCR::Execute (.target.bash_output, scriptname) + ); + y2milestone ("Removing %1 returned %2", + scriptname, + SCR::Execute (.target.bash_output, sformat ("/bin/rm %1", scriptname)) + ); + } else { + y2milestone ("Script %1 doesn't exist, skipping...", scriptname); + } + + } else { -- 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] r59864 - in /branches/SuSE-Code-11-SP1-Branch/live-installer: package/yast2-live-installer.changes src/inst_live_doit.ycp
by jsrain＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: jsrain Date: Mon Nov 30 17:24:18 2009 New Revision: 59864 URL: http://svn.opensuse.org/viewcvs/yast?rev=59864&view=rev Log: merged from trunk Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes Mon Nov 30 17:24:18 2009 @@ -1,8 +1,10 @@ ------------------------------------------------------------------- -Tue Jan 6 14:41:29 CET 2009 - jsrain(a)suse.cz +Thu Jun 11 13:40:23 CEST 2009 - jsrain(a)suse.cz - disable all repos before installation, reenable afterwards (bnc #450228) +- adapted for unified progress during live installation + (bnc#435680) ------------------------------------------------------------------- Tue Aug 11 13:01:49 CEST 2009 - jsrain(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp Mon Nov 30 17:24:18 2009 @@ -11,6 +11,7 @@ import "Wizard"; import "ImageInstallation"; import "LiveInstaller"; +import "SlideShow"; Installation::destdir = "/mnt"; @@ -72,7 +73,10 @@ integer progress_step = (100-progress_start) * index / size (symlinks); foreach (string link, string target, symlinks, { index = index + 1; - Progress::Title (sformat (_("Copying %1..."), link)); + SlideShow::StageProgress( progress_start, nil); + SlideShow::SubProgress( 0, sformat (_("Copying %1..."), link)); + SlideShow::AppendMessageToInstLog (sformat (_("Copying %1..."), link)); +// Progress::Title (sformat (_("Copying %1..."), link)); SCR::Execute (.target.remove, sformat ("%1/%2", Installation::destdir, link)); /* list<string> components = splitstring (link, "/"); @@ -88,7 +92,9 @@ integer progress_done = progress_start + progress_step; ImageInstallation::FileSystemCopy ("/" + target, sformat ("%1/%2", Installation::destdir, link), progress_start, progress_done); progress_start = progress_done; - Progress::Step (progress_start); +// Progress::Step (progress_start); + SlideShow::StageProgress( progress_done, nil); + SlideShow::SubProgress( 100, nil); }); return true; } @@ -104,7 +110,7 @@ SCR::Execute (.target.bash, sformat ("/bin/cp -a %1/etc %2", tmpdir, Installation::destdir)); return true; } - +/* Progress::New( // Headline for last dialog of base installation: Install LILO etc. _("Copying the Live Image to Hard Disk"), @@ -119,18 +125,27 @@ Progress::NextStage (); Progress::Title (_("Evaluating filesystems to copy...")); +*/ +SlideShow::MoveToStage( "images" ); +SlideShow::StageProgress( 0, _("Evaluating filesystems to copy...") ); +SlideShow::AppendMessageToInstLog (_("Evaluating filesystems to copy...")); map<string,string> copy_map = LinksMap (LinksToCopyList ()); +SlideShow::SubProgress( 0, _("Copying root filesystem...")); +SlideShow::AppendMessageToInstLog (_("Copying root filesystem...")); +SlideShow::StageProgress( 5, _("Copying live image...")); +/* Progress::NextStageStep (5); Progress::Title (_("Copying root filesystem...")); +*/ integer steps = size (copy_map) + 1; integer step_size = 95 / steps; CopyRootImage (5, 5 + step_size); -Progress::NextStageStep (10); +//Progress::NextStageStep (10); CopySymlinkedImage (copy_map, 5 + step_size); -Progress::Finish(); -Progress::Title (_("Finished.")); +//Progress::Finish(); +//Progress::Title (_("Finished.")); // reenable sources/services before their status gets stored in the target system Pkg::SourceEditSet (LiveInstaller::source_states); -- 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] r59863 - in /branches/SuSE-Code-11-SP1-Branch/live-installer: package/yast2-live-installer.changes src/LiveInstaller.ycp src/inst_live_doit.ycp src/live-installer.ycp
by jsrain＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: jsrain Date: Mon Nov 30 17:21:40 2009 New Revision: 59863 URL: http://svn.opensuse.org/viewcvs/yast?rev=59863&view=rev Log: merged from trunk Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes branches/SuSE-Code-11-SP1-Branch/live-installer/src/LiveInstaller.ycp branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp branches/SuSE-Code-11-SP1-Branch/live-installer/src/live-installer.ycp Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes Mon Nov 30 17:21:40 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 6 14:41:29 CET 2009 - jsrain(a)suse.cz + +- disable all repos before installation, reenable afterwards + (bnc #450228) + +------------------------------------------------------------------- Tue Aug 11 13:01:49 CEST 2009 - jsrain(a)suse.cz - replace /etc/YaST2/control.xml before starting live installation Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/src/LiveInstaller.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/live-installer/src/LiveInstaller.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/live-installer/src/LiveInstaller.ycp Mon Nov 30 17:21:40 2009 @@ -41,5 +41,8 @@ global boolean run_full_proposal = false; +global list<map<string,any> > source_states = []; + +global map<string, map<string,any> > service_states = $[]; /* EOF */ } Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp Mon Nov 30 17:21:40 2009 @@ -10,6 +10,7 @@ import "Progress"; import "Wizard"; import "ImageInstallation"; +import "LiveInstaller"; Installation::destdir = "/mnt"; @@ -131,6 +132,14 @@ Progress::Finish(); Progress::Title (_("Finished.")); +// reenable sources/services before their status gets stored in the target system +Pkg::SourceEditSet (LiveInstaller::source_states); +foreach (string s, map<string,any> state, LiveInstaller::service_states, { + Pkg::ServiceSet (s, state); + Pkg::ServiceSave (s); +}); + + return `next; } // client end Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/src/live-installer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/live-installer/src/live-installer.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/live-installer/src/live-installer.ycp Mon Nov 30 17:21:40 2009 @@ -60,6 +60,22 @@ } } + // ensure all installation sources are disabled + boolean source_init_success = Pkg::SourceStartManager( false ); + if (source_init_success) { + LiveInstaller::source_states = Pkg::SourceEditGet(); + Pkg::SourceEditSet (maplist (map<string,any> s, LiveInstaller::source_states, { + s["enabled"] = false; + return s; + })); + foreach (string s, Pkg::ServiceAliases (), { + map<string,any> state = Pkg::ServiceGet (s); + LiveInstaller::service_states[s] = state; + state["enabled"] = false; + Pkg::ServiceSet (s, state); + }); + } + Installation::destdir = "/mnt"; Installation::scr_destdir = "/mnt"; import "Storage"; @@ -133,6 +149,13 @@ symbol ret = ProductControl::Run(); y2milestone("ProductControl::Run() returned: %1", ret); + // reenable sources/services + Pkg::SourceEditSet (LiveInstaller::source_states); + foreach (string s, map<string,any> state, LiveInstaller::service_states, { + Pkg::ServiceSet (s, state); + Pkg::ServiceSave (s); + }); + Pkg::SourceFinishAll(); Pkg::TargetFinish(); -- 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] <web-client> master : fix session timeout from backend (bnc#555255)
by Josef Reidinger 30 Nov '09

30 Nov '09

ref: refs/heads/master commit 098add2bf15a4fb8b32a8571aad9db4305ccd2ac Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Nov 30 15:04:21 2009 +0100 fix session timeout from backend (bnc#555255) --- .../app/controllers/application_controller.rb | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/webclient/app/controllers/application_controller.rb b/webclient/app/controllers/application_controller.rb index 6dffe88..65ff6b9 100644 --- a/webclient/app/controllers/application_controller.rb +++ b/webclient/app/controllers/application_controller.rb @@ -19,6 +19,10 @@ class ApplicationController < ActionController::Base #catch webservice errors rescue_from Exception, :with => :exception_trap + rescue_from ActiveResource::UnauthorizedAccess do #lazy load of activeresource exception + flash[:error] = _("Session timeout"); + redirect_to '/logout' unless request.xhr? + end include AuthenticatedSystem include ErrorConstructor -- 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] <web-client> backgroud_patches_bnc550934 : fix session timeout from backend (bnc#555255)
by Josef Reidinger 30 Nov '09

30 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit 098add2bf15a4fb8b32a8571aad9db4305ccd2ac Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Nov 30 15:04:21 2009 +0100 fix session timeout from backend (bnc#555255) --- .../app/controllers/application_controller.rb | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/webclient/app/controllers/application_controller.rb b/webclient/app/controllers/application_controller.rb index 6dffe88..65ff6b9 100644 --- a/webclient/app/controllers/application_controller.rb +++ b/webclient/app/controllers/application_controller.rb @@ -19,6 +19,10 @@ class ApplicationController < ActionController::Base #catch webservice errors rescue_from Exception, :with => :exception_trap + rescue_from ActiveResource::UnauthorizedAccess do #lazy load of activeresource exception + flash[:error] = _("Session timeout"); + redirect_to '/logout' unless request.xhr? + end include AuthenticatedSystem include ErrorConstructor -- 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] r59862 - /tags/branch-Code-11-SP1-2_17_60/installation/
by locilka＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: locilka Date: Mon Nov 30 14:47:10 2009 New Revision: 59862 URL: http://svn.opensuse.org/viewcvs/yast?rev=59862&view=rev Log: Created tag branch-Code-11-SP1-2_17_60 for installation Added: tags/branch-Code-11-SP1-2_17_60/installation/ (props changed) - copied from r59861, branches/SuSE-Code-11-SP1-Branch/installation/ -- 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] r59861 - /tags/branch-Code-11-SP1-2_17_60/
by locilka＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: locilka Date: Mon Nov 30 14:47:08 2009 New Revision: 59861 URL: http://svn.opensuse.org/viewcvs/yast?rev=59861&view=rev Log: Created tag branch-Code-11-SP1-2_17_60 Added: tags/branch-Code-11-SP1-2_17_60/ -- 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] r59860 - in /branches/SuSE-Code-11-SP1-Branch/installation: VERSION package/yast2-installation.changes
by locilka＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: locilka Date: Mon Nov 30 14:46:58 2009 New Revision: 59860 URL: http://svn.opensuse.org/viewcvs/yast?rev=59860&view=rev Log: New version Modified: branches/SuSE-Code-11-SP1-Branch/installation/VERSION branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes Modified: branches/SuSE-Code-11-SP1-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/VERSION Mon Nov 30 14:46:58 2009 @@ -1 +1 @@ -2.17.59 +2.17.60 Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes Mon Nov 30 14:46:58 2009 @@ -4,6 +4,7 @@ - Repositories added by inst_addon_update_sources use Pkg::RepositoryAdd that does not need access to network (bnc #557723) +- 2.17.60 ------------------------------------------------------------------- Thu Nov 19 16:51:55 CET 2009 - locilka(a)suse.cz -- 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] r59859 - in /branches/SuSE-Code-11-SP1-Branch/installation: package/yast2-installation.changes src/clients/inst_addon_update_sources.ycp
by locilka＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: locilka Date: Mon Nov 30 14:45:12 2009 New Revision: 59859 URL: http://svn.opensuse.org/viewcvs/yast?rev=59859&view=rev Log: - Repositories added by inst_addon_update_sources use Pkg::RepositoryAdd that does not need access to network (bnc #557723) Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_addon_update_sources.ycp Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes Mon Nov 30 14:45:12 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 30 14:38:26 CET 2009 - locilka(a)suse.cz + +- Repositories added by inst_addon_update_sources use + Pkg::RepositoryAdd that does not need access to network + (bnc #557723) + +------------------------------------------------------------------- Thu Nov 19 16:51:55 CET 2009 - locilka(a)suse.cz - Added control file configuration option require_registration Modified: branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_addon_update_sources.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_addon_update_sources.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_addon_update_sources.ycp Mon Nov 30 14:45:12 2009 @@ -40,13 +40,23 @@ /** * @return the installation sources to be added */ -list<string> UpdateUrls () { - // get all available products - list<map<string,any> > products = Pkg::ResolvableProperties ("", `product, ""); - list<list<string> > urls = maplist (map<string, any> p, products, { - return p["update_urls"]:[]; +map <string, string> UpdateUrls () { + map <string, string> urls = $[]; + list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); + + foreach (map<string, any> p, products, { + foreach (string u, p["update_urls"]:[], { + // bnc #542792 + // Repository name must be generated from product details + urls[u] = sformat ( + _("Updates for %1 %2"), + p["display_name"]:p["name"]:p["summary"]:_("Unknown Product"), + p["version"]:"" + ); + }); }); - return (list<string>)toset (flatten (urls)); + + return urls; } @@ -64,23 +74,35 @@ y2milestone ("sources known: %1", knownUrls); map<string, boolean> is_known = listmap (string u, knownUrls, ``($[u: true])); -list<string> updateUrls = UpdateUrls (); +map <string, string> updateUrls = UpdateUrls (); y2milestone ("sources for updates: %1", updateUrls); -list<string> addUrls = filter (string u, updateUrls, ``( ! is_known[u]:false )); +map <string, string> addUrls = filter (string url, string name, updateUrls, ``( ! is_known[url]:false )); y2milestone ("sources to add: %1", addUrls); -if (addUrls != []) +if (addUrls != $[]) { Popup::ShowFeedback (heading, message); list<integer> added_ids = []; - foreach (string u, addUrls, { + foreach (string url, string name, addUrls, { boolean again = true; while (again) { - integer srcid = Pkg::SourceCreate (u, "/"); - y2milestone ("got %1 from creating %2", srcid, u); + // BNC #557723: Repositories migh be created without access to network + // Libzypp must not probe the repo + map <string,any> repo_prop = $[ + "enabled" : true, + "autorefresh" : true, + "name" : (size(name) > 0 ? name : url), + "alias" : (size(name) > 0 ? name : url), + "base_urls" : [url], + "prod_dir" : "/", + + ]; + + integer srcid = Pkg::RepositoryAdd (repo_prop); + y2milestone ("got %1 from creating %2/%3", srcid, url, name); // wrong srcid, must have failed if (srcid == -1) { @@ -94,7 +116,7 @@ Pkg::LastError() ))) { // try again - u = editUrl (u); + url = editUrl (url); } else { // abort again = 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] r59858 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_addon_update_sources.ycp
by locilka＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: locilka Date: Mon Nov 30 14:44:48 2009 New Revision: 59858 URL: http://svn.opensuse.org/viewcvs/yast?rev=59858&view=rev Log: - Repositories added by inst_addon_update_sources use Pkg::RepositoryAdd that does not need access to network (bnc #557723) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_addon_update_sources.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Nov 30 14:44:48 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 30 14:38:26 CET 2009 - locilka(a)suse.cz + +- Repositories added by inst_addon_update_sources use + Pkg::RepositoryAdd that does not need access to network + (bnc #557723) + +------------------------------------------------------------------- Tue Nov 24 16:13:31 CET 2009 - kmachalkova(a)suse.cz Cumulative patch with SLE11 SP1 features: Modified: trunk/installation/src/clients/inst_addon_update_sources.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_ad… ============================================================================== --- trunk/installation/src/clients/inst_addon_update_sources.ycp (original) +++ trunk/installation/src/clients/inst_addon_update_sources.ycp Mon Nov 30 14:44:48 2009 @@ -89,8 +89,20 @@ boolean again = true; while (again) { - integer srcid = Pkg::SourceCreate (url, "/"); - y2milestone ("got %1 from creating %2", srcid, url); + // BNC #557723: Repositories migh be created without access to network + // Libzypp must not probe the repo + map <string,any> repo_prop = $[ + "enabled" : true, + "autorefresh" : true, + "name" : (size(name) > 0 ? name : url), + "alias" : (size(name) > 0 ? name : url), + "base_urls" : [url], + "prod_dir" : "/", + + ]; + + integer srcid = Pkg::RepositoryAdd (repo_prop); + y2milestone ("got %1 from creating %2/%3", srcid, url, name); // wrong srcid, must have failed if (srcid == -1) { @@ -112,9 +124,6 @@ // everything is ok } else { - // bnc #542792 - // Repository name must be set - Pkg::SourceEditSet([ $["SrcId" : srcid, "name" : name] ]); added_ids = add (added_ids, srcid); again = false; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0