Author: ug Date: Thu Jan 28 13:23:39 2010 New Revision: 60607 URL: http://svn.opensuse.org/viewcvs/yast?rev=60607&view=rev Log: you can choose a different inst-source in the UI then the one of the running system Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/software_auto.ycp trunk/autoinstallation/src/modules/AutoinstSoftware.ycp trunk/autoinstallation/src/schema/partitioning.rnc trunk/autoinstallation/src/schema/software.rnc Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=60607&r1=60606&r2=60607&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Thu Jan 28 13:23:39 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 28 13:23:03 CET 2010 - ug@suse.de + +- you can choose a different inst-source in the UI then the one + of the running system + +------------------------------------------------------------------- Wed Jan 27 16:00:10 CET 2010 - ug@suse.de - symbol added for the use of ImsmDriver (bnc#574270) Modified: trunk/autoinstallation/src/clients/software_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/software_auto.ycp?rev=60607&r1=60606&r2=60607&view=diff ============================================================================== --- trunk/autoinstallation/src/clients/software_auto.ycp (original) +++ trunk/autoinstallation/src/clients/software_auto.ycp Thu Jan 28 13:23:39 2010 @@ -18,7 +18,8 @@ import "Label"; import "PackageAI"; import "AutoInstall"; - + import "SourceManager"; + include "autoinstall/dialogs.ycp"; any ret = nil; @@ -55,9 +56,56 @@ Pkg::CallbackAcceptFileWithoutChecksum(AutoInstall::callbackTrue_boolean_string); Pkg::CallbackAcceptUnsignedFile(AutoInstall::callbackTrue_boolean_string_integer); - Pkg::TargetInit("/", false); + string tmpdir = (string)SCR::Read(.target.tmpdir); // AutoinstSoftware::pmInit(); + //string mainRepo = "http://10.10.0.162/SLES11/DVD1/"; + //string mainRepo = "ftp://10.10.0.100/install/SLP/openSUSE-11.2/x86_64/DVD1/"; + string mainRepo = AutoinstSoftware::instsource; + term contents = `VBox( + `HBox( + `VBox( + `TextEntry(`id(`location), _("Location of the installation source"), mainRepo), + `CheckBox(`id(`localSource), `opt(`notify), _("The inst-source of this system"), mainRepo == "" ) + ) + ), + `HBox( + `PushButton(`id(`ok), "&OK"), + `PushButton(`id(`abort), "&Abort") + ) + ); + UI::OpenDialog( `opt(`decorated ), contents ); + UI::ChangeWidget(`id(`location) , `Enabled, mainRepo != "" ); + boolean okay = false; + do { + any ret = nil; + ret = UI::UserInput(); + if( ret == `ok ) { + if( (boolean)UI::QueryWidget(`id(`localSource), `Value) ) { + Pkg::TargetInit("/", false); + okay = true; + } else { + mainRepo = (string)UI::QueryWidget(`id(`location), `Value); + Pkg::TargetInit(tmpdir, false); + if( SourceManager::createSource (mainRepo) == `ok ) + okay = true; + else + Popup::Error( _("using that installation source failed") ); + } + } else if( ret == `abort ) { + UI::CloseDialog(); + return `back; + } else if( ret == `localSource ) { + boolean localSource = (boolean)UI::QueryWidget(`id(`localSource), `Value); + UI::ChangeWidget(`id(`location) , `Enabled, !localSource); + if( localSource ) + UI::ChangeWidget(`id(`location) , `Value, ""); + } + } while( ! okay ); + UI::CloseDialog(); + AutoinstSoftware::instsource = mainRepo; + + Pkg::SourceStartManager(true); Wizard::CreateDialog(); @@ -68,7 +116,7 @@ helptext, false, true); list > patterns = Pkg::ResolvableProperties ("", `pattern, ""); y2milestone("available patterns %1",patterns); - Pkg::TargetInit("/tmp", false); // don't copy the list of really installed packages (#231687) +// Pkg::TargetInit("/tmp", false); // don't copy the list of really installed packages (#231687) // Construct a box with radiobuttons for each software base configuration term baseconfs_box = `VBox(); Modified: trunk/autoinstallation/src/modules/AutoinstSoftware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstSoftware.ycp?rev=60607&r1=60606&r2=60607&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstSoftware.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Thu Jan 28 13:23:39 2010 @@ -53,6 +53,8 @@ global list<string> inst = []; global list > all_xpatterns = []; + global string instsource = ""; + /** * Function sets internal variable, which indicates, that any * settings were modified, to "true" @@ -81,10 +83,16 @@ { Software = settings; patterns = settings["patterns"]:[]; + instsource = settings["instsource"]:""; string notFound = ""; + + /* what is this good for? disturbs the main-repo selection */ + /* Packages::Init(true); Packages::InitializeAddOnProducts(); + */ + list<string> packagesAvailable = Pkg::GetPackages (`available, true); list<string> patternsAvailable = []; list > allPatterns = Pkg::ResolvableDependencies ("", `pattern, ""); @@ -195,6 +203,7 @@ if (PackageAI::toremove != []) s["remove-packages"] = PackageAI::toremove; + s["instsource"] = instsource; return (s); } Modified: trunk/autoinstallation/src/schema/partitioning.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/schema/partitioning.rnc?rev=60607&r1=60606&r2=60607&view=diff ============================================================================== --- trunk/autoinstallation/src/schema/partitioning.rnc (original) +++ trunk/autoinstallation/src/schema/partitioning.rnc Thu Jan 28 13:23:39 2010 @@ -16,6 +16,7 @@ element pesize { text }? & element type { SYMBOL }? & element use { text }? & + element imsmdriver { SYMBOL }? & partitions? } prefer_remove = Modified: trunk/autoinstallation/src/schema/software.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/schema/software.rnc?rev=60607&r1=60606&r2=60607&view=diff ============================================================================== --- trunk/autoinstallation/src/schema/software.rnc (original) +++ trunk/autoinstallation/src/schema/software.rnc Thu Jan 28 13:23:39 2010 @@ -10,7 +10,8 @@ post-patterns? & remove-packages? & patterns? & - element do_online_update { BOOLEAN }? + element do_online_update { BOOLEAN }? & + element instsource {text}? } patterns = element patterns { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org