Author: jsuchome Date: Thu Apr 24 13:40:04 2008 New Revision: 47030 URL: http://svn.opensuse.org/viewcvs/yast?rev=47030&view=rev Log: - Patch CD: ensure first CD is in drive before synchronization with ZMD (bnc#381594) - 2.13.67 Modified: branches/SuSE-SLE-10-SP2-Branch/online-update/VERSION branches/SuSE-SLE-10-SP2-Branch/online-update/package/yast2-online-update.changes branches/SuSE-SLE-10-SP2-Branch/online-update/src/online_update.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/online-update/VERSION?rev=47030&r1=47029&r2=47030&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/online-update/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/online-update/VERSION Thu Apr 24 13:40:04 2008 @@ -1 +1 @@ -2.13.66 +2.13.67 Modified: branches/SuSE-SLE-10-SP2-Branch/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/online-update/package/yast2-online-update.changes?rev=47030&r1=47029&r2=47030&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/online-update/package/yast2-online-update.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/online-update/package/yast2-online-update.changes Thu Apr 24 13:40:04 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 24 13:20:54 CEST 2008 - jsuchome@suse.cz + +- Patch CD: ensure first CD is in drive before synchronization with + ZMD (bnc#381594) +- 2.13.67 + +------------------------------------------------------------------- Tue Apr 8 10:18:32 CEST 2008 - jsuchome@suse.cz - use y2logRPM for logging rpm output (bnc#372863) Modified: branches/SuSE-SLE-10-SP2-Branch/online-update/src/online_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/online-update/src/online_update.ycp?rev=47030&r1=47029&r2=47030&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/online-update/src/online_update.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/online-update/src/online_update.ycp Thu Apr 24 13:40:04 2008 @@ -21,6 +21,7 @@ import "Popup"; import "Progress"; import "SourceManager"; + import "URL"; import "Wizard"; import "GetInstArgs"; @@ -196,6 +197,18 @@ break; } }); + if (add_new_source) + { + // now, ensure there's first CD in the drive (bnc#381594) + map parsed = URL::Parse (new_source["url"]:""); + if (parsed["scheme"]:"" == "cd") + { + // SourceProvideFile should use a callback to ask user for 1st media + if (Pkg::SourceProvideFile ( + OnlineUpdate::cd_source, 1, "/media.1/media") == nil) + add_new_source = false; + } + } if (add_new_source) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org