[yast-commit] r59539 - in /branches/SuSE-Code-11-SP1-Branch/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp

Author: aschnell Date: Fri Nov 13 16:21:05 2009 New Revision: 59539 URL: http://svn.opensuse.org/viewcvs/yast?rev=59539&view=rev Log: - check that Storage::Update is only run once (bnc #477778) Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes?rev=59539&r1=59538&r2=59539&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Fri Nov 13 16:21:05 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 13 16:19:18 CET 2009 - aschnell@suse.de + +- check that Storage::Update is only run once (bnc #477778) + +------------------------------------------------------------------- Tue Nov 10 11:28:26 CET 2009 - aschnell@suse.de - added IMSM support (fate #305883) Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp?rev=59539&r1=59538&r2=59539&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Fri Nov 13 16:21:05 2009 @@ -184,6 +184,10 @@ map cfg_xml = $[]; string part_insts = ""; +// bnc#477778 - Updating SLES 10 SP2 (GA+) to SLES 11 RC4 produces multiple identical grub boot menu entries +// flag indicates calling StorageUpdate::Update() +boolean called_update = false; + /** * Returns Device Name @@ -5503,6 +5507,10 @@ */ global define void Update( map oldv, map newv ) ``{ + // bnc#477778 - Updating SLES 10 SP2 (GA+) to SLES 11 RC4 produces multiple identical grub boot menu entries + // called_update is flag which indicates if Update() was already called + if (!called_update) + { y2milestone( "Update old:%1 new:%2", oldv, newv ); // Enterprise products do not have minor release number @@ -5582,6 +5590,13 @@ map bo = (map)SCR::Execute (.target.bash_output, cmd ); y2milestone( "Update bo %1", bo ); } + // set flag -> it indicates that Update was already called + called_update = true; + } + else + { + y2milestone("Skip calling Update() -> It was already called"); + } } global define list<string> GetTranslatedDevices( map oldv, map newv, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org