August 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r62347 - in /branches/SuSE-Code-11-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/dialogs.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: jsuchome Date: Thu Aug 5 13:17:44 2010 New Revision: 62347 URL: http://svn.opensuse.org/viewcvs/yast?rev=62347&view=rev Log: - save config.xml after changing the package list (bnc#599952) - offer more options when packages are not available (bnc#599952) - check for package dependencies automatically (bnc#599952) - 2.17.36 Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION Thu Aug 5 13:17:44 2010 @@ -1 +1 @@ -2.17.35 +2.17.36 Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes Thu Aug 5 13:17:44 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jul 28 15:30:51 CEST 2010 - jsuchome(a)suse.cz + +- save config.xml after changing the package list (bnc#599952) +- offer more options when packages are not available (bnc#599952) +- check for package dependencies automatically (bnc#599952) +- 2.17.36 + +------------------------------------------------------------------- Thu Apr 29 17:54:06 CEST 2010 - jsuchome(a)suse.cz - remember the directory of the saved configuration (bnc#600922) Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp Thu Aug 5 13:17:44 2010 @@ -1246,6 +1246,25 @@ return result; } + boolean InstallPackageOrProvider (string p) { + + boolean selected = Pkg::PkgInstall(p); + y2milestone("selecting package for installation: %1 -> %2", p, selected); + if (!selected) + { + list <list> provides = Pkg::PkgQueryProvides (p); + provides = filter (list l, provides, { + return l[1]:`NONE != `NONE; + }); + string pp = provides[0,0]:""; + if (pp != "") + { + y2milestone("selecting first package providing %1: %2 -> %3", p, pp, Pkg::PkgInstall (pp)); + } + } + + } + /** * Display package selection dialog with preselected packages. * @param base_pattern base pattern to install, can be empty ("") if there is no base pattern @@ -1342,20 +1361,7 @@ { foreach(string p, packages, { - boolean selected = Pkg::PkgInstall(p); - y2milestone("selecting package for installation: %1 -> %2", p, selected); - if (!selected) - { - list <list> provides = Pkg::PkgQueryProvides (p); - provides = filter (list l, provides, { - return l[1]:`NONE != `NONE; - }); - string pp = provides[0,0]:""; - if (pp != "") - { - y2milestone("selecting first package providing %1: %2 -> %3", p, pp, Pkg::PkgInstall (pp)); - } - } + InstallPackageOrProvider (p); }); } @@ -1512,7 +1518,7 @@ y2milestone("Selected packages: %1 ", size(Pkg::GetPackages(`selected, true))); // activate the selections - boolean solved = Pkg::PkgSolve(true); + boolean solved = (ret == `cancel || Pkg::PkgSolve(true)); if (!solved) { @@ -1531,7 +1537,7 @@ list seladd = []; list selbase = []; - if ( ret != `back ) + if ( ret != `back && ret != `cancel) { if (!using_patterns) { Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Thu Aug 5 13:17:44 2010 @@ -223,14 +223,12 @@ UI::ChangeWidget (`id (id), `Value, pat + pac + ign); } + /** - * Handler for software selection + * open package selector with given set of packages, return modified set + * or nil on cancel */ - define symbol HandleSWSelection (string key, map event) { - if (event["ID"]:nil == key) - { - integer package_set = KiwiConfig["package_set"]:0; - map sw_contents = KiwiConfig["packages",package_set]:$[]; + define map modifyPackageSelection (map sw_contents) { integer mbytes = (integer) UI::QueryWidget (`id ("size"), `Value); if (UI::QueryWidget (`id ("sizeunit"), `Value) == "G") @@ -249,7 +247,7 @@ ``(pat["name"]:"")), `packages ); - if (ret_map["ui"]:nil == `cancel) + if (ret_map["ui"]:nil == `cancel || ret_map["ui"]:nil == `failed) return nil; sw_contents["opensusePattern"] = maplist (string name, ret_map["addons"]:[], ``($[ "name" : name])); @@ -257,7 +255,20 @@ ret_map["packages"]:[], ``($[ "name" : name])); sw_contents["ignore"] = maplist (string name, ret_map["taboo"]:[], ``($[ "name" : name])); - KiwiConfig["packages",package_set] = sw_contents; + + return sw_contents; + } + + /** + * Handler for software selection + */ + define symbol HandleSWSelection (string key, map event) { + if (event["ID"]:nil == key) + { + integer package_set = KiwiConfig["package_set"]:0; + map sw_contents = modifyPackageSelection (KiwiConfig["packages",package_set]:$[]); + if (sw_contents != nil) + KiwiConfig["packages",package_set] = sw_contents; InitSWRichText ("rt_sw"); } return nil; @@ -962,6 +973,128 @@ } /** + * Check if selected packages are available (some of them may not after + * deleting some repository) + * return true if there was no conflict + */ + define symbol CheckForAvailablePackages (boolean ignore_allowed) { + + list<map> packages_section = KiwiConfig["packages"]:[]; + integer index = 0; + symbol ret = `ok; + foreach (map pmap, packages_section, { + string type = pmap["type"]:""; + if (type != "delete") + { + Popup::ShowFeedback (_("Checking packages availability..."), _("Please wait...")); + list<string> n_a = []; + foreach (map p, pmap["package"]:[], { + if (p["name"]:"" != "" && !Pkg::IsAvailable (p["name"]:"")) + n_a = add (n_a, p["name"]:""); + }); + Popup::ClearFeedback (); + if (size (n_a) > 0) + { + ret = `missing; + string type_label = section_type_label[type]:type; + + UI::OpenDialog (`opt (`decorated), `HBox (`VSpacing (25), + `VBox ( + `HSpacing (70), + `Left(`Heading (_("Missing packages"))), + `VSpacing(0.2), + // popup text + `RichText (sformat (_("These packages from section '%1' are not available with selected repositories: +%2. + +You can remove the packages from the section, check the detailed package selection or ignore the situation. + +Going to detailed package selection and accepting the view without any further changes results in removal of problematic packages from the section. +"), type_label, mergestring (sort (n_a), " "))), + `HBox ( + // button label + `PushButton (`id (`remove), `opt (`default), _("Remove the packages")), + // button label + `PushButton (`id (`selection), _("Check package selection")), + // button label + `PushButton (`id (`ignore), ignore_allowed ? _("Ignore") : _("Cancel")) + ) + ) + )); + any r = UI::UserInput (); + UI::CloseDialog (); + if (r == `remove) + { + KiwiConfig["packages",index,"package"] = filter (map p, pmap["package"]:[], { + return !contains (n_a, p["name"]:""); + }); + ret = `removed; + } + if (r == `selection) + { + map sw_contents = modifyPackageSelection (KiwiConfig["packages",index]:$[]); + if (sw_contents != nil) + { + KiwiConfig["packages",index] = sw_contents; + ret = `selection; + } + } + } + } + index = index + 1; + }); + + return ret; + } + + /** + * Check if all selected packages and patterns can be installed + * If dependency problem was found, open package selector. + * Return false if package selector was canceled + */ + define boolean CheckPackageDependencies () { + + boolean ret = true; + + list<map> packages_section = KiwiConfig["packages"]:[]; + integer index = 0; + foreach (map pmap, packages_section, { + string type = pmap["type"]:""; + if (type != "delete") + { + Pkg::ResolvableNeutral ("", `package, true); + Pkg::ResolvableNeutral ("", `pattern, true); + + foreach (map pat, pmap["opensusePattern"]:[], { + Pkg::ResolvableInstall(pat["name"]:"", `pattern); + }); + + ProductCreator::MarkTaboo (maplist (map i, pmap["ignore"]:[], ``(i["name"]:""))); + + foreach (map p, KiwiConfig["packages",index,"package"]:[], { + InstallPackageOrProvider (p["name"]:""); + }); + + boolean solved = Pkg::PkgSolve (true); + if (!solved) + { + map sw_contents = modifyPackageSelection (KiwiConfig["packages",index]:$[]); + if (sw_contents != nil) + { + KiwiConfig["packages",index] = sw_contents; + } + else + { + ret = false; + } + } + } + index = index + 1; + }); + return ret; + } + + /** * handler for main action: create the iso image with kiwi */ define boolean CreateImage (string key, map event) { @@ -1040,7 +1173,6 @@ directory."), ]; - Kiwi::WriteConfigXML (KiwiConfig, kiwi_task); boolean create_image_now = false; string selected_profiles = ""; if (size (KiwiConfig["profiles"]:[]) > 0) @@ -1095,6 +1227,21 @@ } if (create_image_now) { + if (CheckForAvailablePackages (false) == `missing) + { + y2milestone ("there were missing packages, not going to build"); + InitSWRichText ("rt_sw"); + return false; + } + if (!CheckPackageDependencies ()) + { + y2milestone ("there was unresolved dependency problem, not going to build"); + InitSWRichText ("rt_sw"); + return false; + } + // write XML now, after possible modification of the package list + Kiwi::WriteConfigXML (KiwiConfig, kiwi_task); + string out_dir = KiwiConfig["iso-directory"]:""; if (FileUtils::CheckAndCreatePath (out_dir) && Kiwi::PrepareAndCreate (out_dir, selected_profiles)) @@ -1121,6 +1268,11 @@ ret = false; } } + else + { + Kiwi::WriteConfigXML (KiwiConfig, kiwi_task); + } + string dir = Kiwi::SaveConfiguration (KiwiConfig, kiwi_task); if (dir != nil && dir != "") { @@ -1204,8 +1356,8 @@ }); KiwiConfig["import_files"] = import_files; - map<string,any> read_config = Kiwi::ReadConfigXML (kiwi_configuration); + if (!KiwiConfig["_imported"]:false) { // "type" had different meaning in ProductCreator::Config... @@ -1867,37 +2019,6 @@ ]; } -/** - * Check if selected packages are available (some of them may not after - * deleting some repository) - */ -define boolean CheckForAvailablePackages () { - - Popup::ShowFeedback (_("Checking packages availability..."), _("Please wait...")); - foreach (map pmap, KiwiConfig["packages"]:[], { - string type = pmap["type"]:""; - if (type != "delete") - { - list<string> n_a = []; - foreach (map p, pmap["package"]:[], { - if (p["name"]:"" != "" && !Package::Available (p["name"]:"")) - n_a = add (n_a, p["name"]:""); - }); - if (size (n_a) > 0) - { - string type_label = section_type_label[type]:type; - // popup headline - Popup::LongText (_("Missing packages"), - // popup text - `RichText (sformat (_("These packages from section '%1' are not available with selected repositories: -%2. -Check the list of packages and package repositories."), type_label, mergestring (sort (n_a), " "))), 70, 25); - } - } - }); - Popup::ClearFeedback (); - return true; -} /** * Main dialog for Kiwi image configuration @@ -1906,7 +2027,10 @@ InitImageConfiguration (); -CheckForAvailablePackages (); +if (CheckForAvailablePackages (true) != `selection) +{ + CheckPackageDependencies (); +} map<string, map> widget_descr = get_widget_description (); widget_descr["tab"] = CWMTab::CreateWidget($[ -- 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] r62346 - in /branches/tmp/jsrain/unattended-migration/autoinstallation: autoyast2.spec.in src/clients/inst_autosetup_upgrade.ycp src/clients/inst_store_upgrade_software.ycp
by jsrain＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: jsrain Date: Thu Aug 5 11:30:03 2010 New Revision: 62346 URL: http://svn.opensuse.org/viewcvs/yast?rev=62346&view=rev Log: updated software selection dumping updated file list Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/autoyast2.spec.in branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_store_upgrade_software.ycp Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/autoyast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/autoyast2.spec.in (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/autoyast2.spec.in Thu Aug 5 11:30:03 2010 @@ -189,6 +189,9 @@ @clientdir@/autoinst_scripts1_finish.ycp @clientdir@/autoinst_scripts2_finish.ycp @clientdir@/ayast_probe.ycp +@clientdir@/inst_autosetup_upgrade.ycp +@clientdir@/inst_store_upgrade_software.ycp + @yncludedir@/autoinstall/xml.ycp @yncludedir@/autoinstall/ask.ycp Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp Thu Aug 5 11:30:03 2010 @@ -409,7 +409,11 @@ if (Pkg::PkgSolve (!Update::onlyUpdateInstalled)) Update::solve_errors = 0; else - Update::solve_errors = Pkg::PkgSolveErrors (); + { + Update::solve_errors = Pkg::PkgSolveErrors (); + if (Profile::current["upgrade","stop_on_solver_conflict"]:true) + AutoinstConfig::Confirm = true; + } } Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_store_upgrade_software.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_store_upgrade_software.ycp (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_store_upgrade_software.ycp Thu Aug 5 11:30:03 2010 @@ -10,40 +10,40 @@ // find out status of patterns list<map<string,any> > patterns = Pkg::ResolvableProperties ("", `pattern, ""); patterns = filter (map<string,any> p, patterns, { - return p["status"]:nil == `selected || p["status"]:nil == `removed; - }); - patterns = filter (map<string,any> p, patterns, { return p["transact_by"]:nil == `user || p["transact_by"]:nil == `app_high; }); list<string> patterns_to_remove = []; list<string> patterns_to_install = maplist (map<string,any> p, patterns, { - if (p["status"]:nil == `selected) + if (p["status"]:nil == `selected || p["status"]:nil == `installed) return p["name"]:""; - else + else if (p["status"]:nil == `removed || p["status"]:nil == `available) patterns_to_remove = add (patterns_to_remove, p["name"]:""); return nil; }); + patterns_to_install = filter (string p, patterns_to_install, { + return p != nil; + }); y2internal ("Patterns to install: %1", patterns_to_install); y2internal ("Patterns to remove: %1", patterns_to_remove); // find out status of packages list<map<string,any> > packages = Pkg::ResolvableProperties ("", `package, ""); packages = filter (map<string,any> p, packages, { - return p["status"]:nil == `selected || p["status"]:nil == `removed; - }); - packages = filter (map<string,any> p, packages, { return p["transact_by"]:nil == `user || p["transact_by"]:nil == `app_high; }); list<string> packages_to_remove = []; list<string> packages_to_install = maplist (map<string,any> p, packages, { - if (p["status"]:nil == `selected) + if (p["status"]:nil == `selected || p["status"]:nil == `installed) return p["name"]:""; - else + else if (p["status"]:nil == `removed || p["status"]:nil == `available) packages_to_remove = add (packages_to_remove, p["name"]:""); return nil; }); + packages_to_install = filter (string p, packages_to_install, { + return p != nil; + }); y2internal ("Packages to install: %1", packages_to_install); y2internal ("Packages to remove: %1", packages_to_remove); -- 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] r62345 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: aschnell Date: Thu Aug 5 11:07:32 2010 New Revision: 62345 URL: http://svn.opensuse.org/viewcvs/yast?rev=62345&view=rev Log: - removed code inserted for testing Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Aug 5 11:07:32 2010 @@ -1203,8 +1203,7 @@ integer t = LibStorage::DiskInfo::swig_transport_get(dinfo); d["transport"] = toSymbol(conv_transport, t); - boolean bt = LibStorage::DiskInfo::swig_iscsi_get(dinfo); bt = true; - + boolean bt = LibStorage::DiskInfo::swig_iscsi_get(dinfo); if( bt ) d["iscsi"] = true; else if( haskey( d, "iscsi" )) -- 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] r62344 - in /trunk/autoinstallation: package/autoyast2.changes src/modules/AutoinstStorage.ycp
by ug＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: ug Date: Thu Aug 5 10:56:14 2010 New Revision: 62344 URL: http://svn.opensuse.org/viewcvs/yast?rev=62344&view=rev Log: a new filesystem can be specified for partitioning_advanced Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstStorage.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Thu Aug 5 10:56:14 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Aug 5 10:53:55 CEST 2010 - ug(a)suse.de + +- a new filesystem can be specified for partitioning_advanced + +------------------------------------------------------------------- Tue Aug 3 11:33:58 CEST 2010 - ug(a)suse.de - reusing more partitions than the hardware still could create Modified: trunk/autoinstallation/src/modules/AutoinstStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstStorage.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstStorage.ycp Thu Aug 5 10:56:14 2010 @@ -641,6 +641,8 @@ target_map = Storage::SetPartitionData (target_map, part, "format", p["format"]:false ); target_map = Storage::SetPartitionData (target_map, part, "delete", false); target_map = Storage::SetPartitionData (target_map, part, "create", false); + if( haskey( p, "filesystem" ) ) + target_map = Storage::SetPartitionData (target_map, part, "filesystem", p["filesystem"]:`ext4); if( size(mount_options) > 0 && !haskey(p, "fstopt" ) ) target_map = Storage::SetPartitionData (target_map, part, "fstopt", mount_options); if( haskey(p, "fstopt" ) ) -- 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] r62343 - /trunk/storage/storage/src/include/ep-hd.ycp
by aschnell＠svn.opensuse.org 04 Aug '10

04 Aug '10

Author: aschnell Date: Wed Aug 4 18:52:20 2010 New Revision: 62343 URL: http://svn.opensuse.org/viewcvs/yast?rev=62343&view=rev Log: - show fibre channel data only for fibre channel disks Modified: trunk/storage/storage/src/include/ep-hd.ycp Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Wed Aug 4 18:52:20 2010 @@ -209,11 +209,13 @@ fields = (list<symbol>) merge(fields, [ `heading_md, `raid_type, `chunk_size, `parity_algorithm ]); } - if (contains([ `CT_DISK ], ctype)) + if (contains([ `CT_DISK ], ctype) && target_map[device, "transport"]:`unknown == `fc) { fields = (list<symbol>) merge(fields, [`heading_fc, `fc_wwpn, `fc_port_id, `fc_fcp_lun ]); } + fields = StorageSettings::FilterOverview(fields); + term buttons = `HBox(); if ((integer) SCR::Read(.target.size, "/usr/sbin/smartctl") > 0) @@ -227,7 +229,7 @@ UI::ReplaceWidget(`tab_panel, `VBox( `HStretch(), - StorageFields::Overview(StorageSettings::FilterOverview(fields), target_map, device), + StorageFields::Overview(fields, target_map, device), add(buttons, `HStretch()) ) ); -- 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] r62342 - in /trunk/storage/storage/src/modules: Storage.ycp StorageFields.ycp
by aschnell＠svn.opensuse.org 04 Aug '10

04 Aug '10

Author: aschnell Date: Wed Aug 4 15:39:22 2010 New Revision: 62342 URL: http://svn.opensuse.org/viewcvs/yast?rev=62342&view=rev Log: - display transport type as bus Modified: trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageFields.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Aug 4 15:39:22 2010 @@ -217,6 +217,20 @@ ] ]; +map<string,any> conv_transport = + $[ "def_sym" : `unknown, + "def_int" : LibStorage::TUNKNOWN(), + "m" : $[ LibStorage::SBP() : `sbp, + LibStorage::ATA() : `ata, + LibStorage::FC() : `fc, + LibStorage::ISCSI() : `iscsi, + LibStorage::SAS() : `sas, + LibStorage::SATA() : `sata, + LibStorage::SPI() : `spi, + LibStorage::USB() : `usb + ] + ]; + map DiskMapVersion = $[]; map DiskMap = $[]; @@ -1185,7 +1199,12 @@ d["label"] = LibStorage::DiskInfo::swig_disklabel_get(dinfo); d["max_logical"] = LibStorage::DiskInfo::swig_maxLogical_get(dinfo); d["max_primary"] = LibStorage::DiskInfo::swig_maxPrimary_get(dinfo); - boolean bt = LibStorage::DiskInfo::swig_iscsi_get(dinfo); + + integer t = LibStorage::DiskInfo::swig_transport_get(dinfo); + d["transport"] = toSymbol(conv_transport, t); + + boolean bt = LibStorage::DiskInfo::swig_iscsi_get(dinfo); bt = true; + if( bt ) d["iscsi"] = true; else if( haskey( d, "iscsi" )) @@ -1639,7 +1658,7 @@ map toDiskMap( map disk, map cinfo ) { list<string> l = [ "size_k", "cyl_size", "cyl_count", "sector_size", "label", "name", "device", - "max_logical", "max_primary", "type", "readonly", + "max_logical", "max_primary", "type", "readonly", "transport", "iscsi", "used_by", "used_by_type", "used_by_device", "partitions", "dasdfmt", "udev_id", "udev_path" ]; foreach( string s, l, Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Wed Aug 4 15:39:22 2010 @@ -733,7 +733,10 @@ case `bus: { - string value = data["bus"]:""; + map<symbol, string> names = $[ `sbp : "Firewire", `ata : "ATA", + `fc : "Fibre Channel", `iscsi : "iSCSI", `sas : "SAS", + `sata : "SATA", `spi : "SCSI", `usb : "USB" ]; + string value = names[data["transport"]:`unknown]:""; if (style == `table) return value; 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] r62341 - /trunk/storage/storage/src/include/auto_part_prepare.ycp
by aschnell＠svn.opensuse.org 04 Aug '10

04 Aug '10

Author: aschnell Date: Wed Aug 4 15:38:18 2010 New Revision: 62341 URL: http://svn.opensuse.org/viewcvs/yast?rev=62341&view=rev Log: - use newer function Modified: trunk/storage/storage/src/include/auto_part_prepare.ycp Modified: trunk/storage/storage/src/include/auto_part_prepare.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/auto… ============================================================================== --- trunk/storage/storage/src/include/auto_part_prepare.ycp (original) +++ trunk/storage/storage/src/include/auto_part_prepare.ycp Wed Aug 4 15:38:18 2010 @@ -26,7 +26,7 @@ y2milestone( "prepare_partitions bytes_per_unit: %1 disk_size:%2", bytes_per_unit, disk_size ); - integer size_of_boot = Partitions::MinimalNeededBootsize(); + integer size_of_boot = Partitions::ProposedBootsize(); integer size_of_swap = 1024 * 1024 * Partitions::SwapSizeMb(0); // The minimum size needed to install a default system -- 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] r62340 - /tags/branch-Linux-11_3-2_19_2/add-on-creator/
by jsuchome＠svn.opensuse.org 04 Aug '10

04 Aug '10

Author: jsuchome Date: Wed Aug 4 15:04:49 2010 New Revision: 62340 URL: http://svn.opensuse.org/viewcvs/yast?rev=62340&view=rev Log: Created tag branch-Linux-11_3-2_19_2 for add-on-creator Added: tags/branch-Linux-11_3-2_19_2/add-on-creator/ - copied from r62339, branches/SuSE-Linux-11_3-Branch/add-on-creator/ -- 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] r62339 - in /branches/SuSE-Linux-11_3-Branch/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 04 Aug '10

04 Aug '10

Author: jsuchome Date: Wed Aug 4 15:04:41 2010 New Revision: 62339 URL: http://svn.opensuse.org/viewcvs/yast?rev=62339&view=rev Log: - cleanup the preparation directory for building iso image (bnc#623036) - 2.19.2 Modified: branches/SuSE-Linux-11_3-Branch/add-on-creator/VERSION branches/SuSE-Linux-11_3-Branch/add-on-creator/package/yast2-add-on-creator.changes branches/SuSE-Linux-11_3-Branch/add-on-creator/src/AddOnCreator.ycp Modified: branches/SuSE-Linux-11_3-Branch/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/add-on… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/add-on-creator/VERSION (original) +++ branches/SuSE-Linux-11_3-Branch/add-on-creator/VERSION Wed Aug 4 15:04:41 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: branches/SuSE-Linux-11_3-Branch/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/add-on… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/add-on-creator/package/yast2-add-on-creator.changes (original) +++ branches/SuSE-Linux-11_3-Branch/add-on-creator/package/yast2-add-on-creator.changes Wed Aug 4 15:04:41 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 27 13:48:15 CEST 2010 - jsuchome(a)suse.cz + +- cleanup the preparation directory for building iso image + (bnc#623036) +- 2.19.2 + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: branches/SuSE-Linux-11_3-Branch/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/add-on… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/add-on-creator/src/AddOnCreator.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/add-on-creator/src/AddOnCreator.ycp Wed Aug 4 15:04:41 2010 @@ -3088,6 +3088,8 @@ Progress::NextStage(); + // when building ISO, target directory is defined by iso_path: + // let's use base_output_path for gathering data needed for iso creation if (current_product["iso"]:false) { string iso_path = current_product["iso_path"]:""; @@ -3097,6 +3099,10 @@ if (!only_sign_product) { base_output_path= tmpdir + "/output"; + if (FileUtils::Exists (base_output_path)) + { + SCR::Execute (.target.bash, sformat ("/bin/rm -rf '%1'", base_output_path)); + } SCR::Execute (.target.mkdir, base_output_path); } } -- 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] r62338 - /tags/branch-Linux-11_2-2_18_9/add-on-creator/
by jsuchome＠svn.opensuse.org 04 Aug '10

04 Aug '10

Author: jsuchome Date: Wed Aug 4 15:04:39 2010 New Revision: 62338 URL: http://svn.opensuse.org/viewcvs/yast?rev=62338&view=rev Log: Created tag branch-Linux-11_2-2_18_9 for add-on-creator Added: tags/branch-Linux-11_2-2_18_9/add-on-creator/ - copied from r62337, branches/SuSE-Linux-11_2-Branch/add-on-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0