April 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56626 - /tags/branch-SLE-10-SP3-2_13_214/installation/
by locilka＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: locilka Date: Fri Apr 3 15:40:57 2009 New Revision: 56626 URL: http://svn.opensuse.org/viewcvs/yast?rev=56626&view=rev Log: Some more changes Removed: tags/branch-SLE-10-SP3-2_13_214/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] r56625 - /tags/branch-SLE-10-SP3-2_13_214/installation/
by locilka＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: locilka Date: Fri Apr 3 15:13:18 2009 New Revision: 56625 URL: http://svn.opensuse.org/viewcvs/yast?rev=56625&view=rev Log: Created tag branch-SLE-10-SP3-2_13_214 for installation Added: tags/branch-SLE-10-SP3-2_13_214/installation/ - copied from r56624, branches/SuSE-SLE-10-SP3-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] r56624 - /tags/branch-SLE-10-SP3-2_13_214/
by locilka＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: locilka Date: Fri Apr 3 15:13:16 2009 New Revision: 56624 URL: http://svn.opensuse.org/viewcvs/yast?rev=56624&view=rev Log: Created tag branch-SLE-10-SP3-2_13_214 Added: tags/branch-SLE-10-SP3-2_13_214/ -- 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] r56623 - in /branches/tmp/SLE-11-SP1-Stash/add-on: package/yast2-add-on.changes src/add-on-workflow.ycp yast2-add-on.spec.in
by locilka＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: locilka Date: Fri Apr 3 14:40:28 2009 New Revision: 56623 URL: http://svn.opensuse.org/viewcvs/yast?rev=56623&view=rev Log: - Adjusting initial repository name according to LABEL in content file (bnc #481828). Modified: branches/tmp/SLE-11-SP1-Stash/add-on/package/yast2-add-on.changes branches/tmp/SLE-11-SP1-Stash/add-on/src/add-on-workflow.ycp branches/tmp/SLE-11-SP1-Stash/add-on/yast2-add-on.spec.in Modified: branches/tmp/SLE-11-SP1-Stash/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/add-on/p… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/add-on/package/yast2-add-on.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/add-on/package/yast2-add-on.changes Fri Apr 3 14:40:28 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 3 14:34:11 CEST 2009 - locilka(a)suse.cz + +- Adjusting initial repository name according to LABEL in content + file (bnc #481828). + +------------------------------------------------------------------- Wed Mar 18 17:59:31 CET 2009 - locilka(a)suse.cz - Removing a work around that broke the possibility to use several Modified: branches/tmp/SLE-11-SP1-Stash/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/add-on/s… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/add-on/src/add-on-workflow.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/add-on/src/add-on-workflow.ycp Fri Apr 3 14:40:28 2009 @@ -10,6 +10,7 @@ * * Authors: * Jiri Srain <jsrain(a)suse.cz> + * Lukas Ocilka <locilka(a)suse.cz> * * */ @@ -34,6 +35,7 @@ import "Installation"; import "PackageCallbacks"; import "PackagesUI"; +import "Packages"; include "packager/inst_source_dialogs.ycp"; include "packager/repositories_include.ycp"; @@ -195,6 +197,8 @@ }); if (src_id_found) { + // BNC #481828: Using LABEL from content file as a repository name + Packages::AdjustSourcePropertiesAccordingToProduct (AddOnProduct::src_id); // used add-ons are stored in a special list AddAddOnToStore (AddOnProduct::src_id); } else { @@ -286,14 +290,9 @@ // busy message UI::OpenDialog(`Label(`id (`add_on_popup_id), _("Initializing new source..."))); integer src_id = SourceManager::newSources[0]:0; - map data = Pkg::SourceGeneralData (src_id); - y2milestone("Adding product: %1", data); - string url = data["url"]:""; - string product_dir = data["product_dir"]:""; - y2milestone ("Deleting source %1", src_id); - Pkg::SourceDelete (src_id); - src_id = Pkg::SourceCreate (url, product_dir); - SourceManager::newSources = [src_id]; + + // BNC #481828: Using LABEL from content file as a repository name + Packages::AdjustSourcePropertiesAccordingToProduct (src_id); // a little hack because of packager leaving // windows open... @@ -309,16 +308,6 @@ } } - if (src_id == -1) - { - // error report - Report::Error (_("Failed to initialize the software repository.")); - AddOnProduct::ClearRegistrationRequest (src_id); - - y2milestone ("CatalogSelect Dialog ret: %1", AddOnProduct::last_ret); - return `finish; - } - AddOnProduct::src_id = src_id; SourceManager::newSources = [src_id]; y2milestone ("Only one source available - skipping dialog"); @@ -326,6 +315,7 @@ y2milestone ("CatalogSelect Dialog ret: %1", AddOnProduct::last_ret); return AddOnProduct::last_ret; } + y2milestone ("Running catalog select dialog"); list catalogs = maplist (integer src, sources, { map data = Pkg::SourceGeneralData (src); @@ -360,17 +350,8 @@ if (ret == `abort || ret == `cancel) { ret = `abort; -// if (Stage::initial()) -// { -// if (Popup::ConfirmAbort (`painless)) -// break; -// } -// else -// { - // yes-no popup - if (Popup::YesNo (_("Really abort add-on product installation?"))) - break; -// } + if (Popup::YesNo (_("Really abort add-on product installation?"))) + break; continue; } else if (ret == `back) @@ -401,26 +382,13 @@ foreach (integer src, SourceManager::newSources, { if (src != selected) { - y2milestone ("Deleting source %1", src); + y2milestone ("Deleting unused source %1", src); Pkg::SourceDelete (src); } }); - map data = Pkg::SourceGeneralData (selected); - string url = data["url"]:""; - string product_dir = data["product_dir"]:""; - y2milestone ("Deleting source %1", selected); - Pkg::SourceDelete (selected); - selected = Pkg::SourceCreate (url, product_dir); - SourceManager::newSources = [selected]; - if (selected == -1) - { - // error report - Report::Error (_("Failed to initialize the software repository.")); - AddOnProduct::ClearRegistrationRequest (selected); - y2milestone ("CatalogSelect Dialog ret: %1", `finish); - return `finish; - } + // BNC #481828: Using LABEL from content file as a repository name + Packages::AdjustSourcePropertiesAccordingToProduct (selected); AddOnProduct::src_id = selected; SourceManager::newSources = [selected]; Modified: branches/tmp/SLE-11-SP1-Stash/add-on/yast2-add-on.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/add-on/y… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/add-on/yast2-add-on.spec.in (original) +++ branches/tmp/SLE-11-SP1-Stash/add-on/yast2-add-on.spec.in Fri Apr 3 14:40:28 2009 @@ -7,8 +7,8 @@ Requires: yast2-installation Requires: yast2-country -# repositories_include.ycp -Requires: yast2-packager >= 2.16.47 +# Packages::AdjustSourcePropertiesAccordingToProduct +Requires: yast2-packager >= 2.17.60 # bugzilla #335582, new API for StorageDevices Requires: yast2-storage >= 2.16.1 -- 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] r56622 - in /branches/tmp/SLE-11-SP1-Stash/packager: package/yast2-packager.changes src/modules/Packages.ycp
by locilka＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: locilka Date: Fri Apr 3 14:40:10 2009 New Revision: 56622 URL: http://svn.opensuse.org/viewcvs/yast?rev=56622&view=rev Log: - Adjusting initial repository name according to LABEL in content file. Exporting the same function for Add-Ons (bnc #481828). Modified: branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes branches/tmp/SLE-11-SP1-Stash/packager/src/modules/Packages.ycp Modified: branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/packager… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes Fri Apr 3 14:40:10 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 3 14:31:20 CEST 2009 - locilka(a)suse.cz + +- Adjusting initial repository name according to LABEL in content + file. Exporting the same function for Add-Ons (bnc #481828). + +------------------------------------------------------------------- Fri Feb 20 17:38:52 CET 2009 - locilka(a)suse.cz - Always storing the current set of repositories before calling Modified: branches/tmp/SLE-11-SP1-Stash/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/packager… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/packager/src/modules/Packages.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/packager/src/modules/Packages.ycp Fri Apr 3 14:40:10 2009 @@ -1345,6 +1345,81 @@ return true; } +/** + * Adjusts repository name according to LABEL in content file + * or a first product found on the media (as a fallback). + * + * @param integer repository ID + * @return boolean if successful + * + * @see BNC #481828 + */ +global boolean AdjustSourcePropertiesAccordingToProduct (integer src_id) { + // This function is used from several places (also YaST Add-On) + + if (src_id == nil || src_id < 0) { + y2error ("Wrong source ID: %1", src_id); + return nil; + } + + y2milestone ("Trying to adjust repository name for: %1", src_id); + string new_name = nil; + + // At first, try LABEL from content file + string contentfile = Pkg::SourceProvideSignedFile (src_id, 1, "/content", true /* optional */); + if (contentfile != nil) { + map contentmap = (map) SCR::Read (.content_file, contentfile); + if (haskey (contentmap, "LABEL") && contentmap["LABEL"]:nil != nil && contentmap["LABEL"]:"" != "") { + new_name = contentmap["LABEL"]:""; + + if (regexpmatch (new_name, "^\[ \t\]\+")) + new_name = regexpsub (new_name, "^\[ \t\]\+(.*)", "\\1"); + if (regexpmatch (new_name, "\[ \t\]\+$")) + new_name = regexpsub (new_name, "(.*)\[ \t\]\+$", "\\1"); + + y2milestone ("Using LABEL from content file: %1", new_name); + } else { + y2warning ("No (useful) LABEL in product content file"); + } + } + + // As a fallback, + if (new_name == nil || new_name == "") { + y2milestone ("Trying to get repository name from products"); + list <map <string, any> > all_products = Pkg::ResolvableProperties ("", `product, ""); + foreach (map <string, any> one_product, all_products, { + // source ID matches + if (one_product["source"]:-1 == src_id) { + if (haskey (one_product, "name") && one_product["name"]:nil != nil && one_product["name"]:"" != "") { + new_name = one_product["name"]:""; + y2milestone ("Product name found: %1", new_name); + break; + } + } + }); + } + + // Finally, some (new) name has been adjusted + if (new_name != nil && new_name != "") { + y2milestone ("Adjusting repository name"); + list <map <string, any> > sources_got = Pkg::SourceEditGet(); + list <map <string, any> > sources_set = []; + foreach (map <string, any> one_source, sources_got, { + if (one_source["SrcId"]:-1 == src_id) { + one_source["name"] = new_name; + } + sources_set = add (sources_set, one_source); + }); + + return Pkg::SourceEditSet (sources_set); + // Bad luck, nothing useful found + } else { + y2warning ("No name found"); + + return false; + } +} + global void Initialize_StageInitial (boolean show_popup, string base_url, string log_url) { integer initial_source = nil; ImportGPGKeys (); @@ -1383,6 +1458,9 @@ } } + // BNC #481828: Using LABEL from content file as a repository name + AdjustSourcePropertiesAccordingToProduct (base_source_id); + base_source_id = initial_source; y2milestone ("Base source ID: %1", base_source_id); -- 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] r56621 - in /trunk/add-on: VERSION package/yast2-add-on.changes src/add-on-workflow.ycp yast2-add-on.spec.in
by locilka＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: locilka Date: Fri Apr 3 14:35:02 2009 New Revision: 56621 URL: http://svn.opensuse.org/viewcvs/yast?rev=56621&view=rev Log: - Adjusting initial repository name according to LABEL in content file (bnc #481828). - 2.18.4 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp trunk/add-on/yast2-add-on.spec.in Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=56621&r1=5662… ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Fri Apr 3 14:35:02 2009 @@ -1 +1 @@ -2.18.3 +2.18.4 Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.chan… ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Fri Apr 3 14:35:02 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Apr 3 14:34:11 CEST 2009 - locilka(a)suse.cz + +- Adjusting initial repository name according to LABEL in content + file (bnc #481828). +- 2.18.4 + +------------------------------------------------------------------- Wed Mar 18 17:59:31 CET 2009 - locilka(a)suse.cz - Removing a work around that broke the possibility to use several Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?r… ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Fri Apr 3 14:35:02 2009 @@ -10,6 +10,7 @@ * * Authors: * Jiri Srain <jsrain(a)suse.cz> + * Lukas Ocilka <locilka(a)suse.cz> * * */ @@ -34,6 +35,7 @@ import "Installation"; import "PackageCallbacks"; import "PackagesUI"; +import "Packages"; include "packager/inst_source_dialogs.ycp"; include "packager/repositories_include.ycp"; @@ -195,6 +197,8 @@ }); if (src_id_found) { + // BNC #481828: Using LABEL from content file as a repository name + Packages::AdjustSourcePropertiesAccordingToProduct (AddOnProduct::src_id); // used add-ons are stored in a special list AddAddOnToStore (AddOnProduct::src_id); } else { @@ -286,14 +290,9 @@ // busy message UI::OpenDialog(`Label(`id (`add_on_popup_id), _("Initializing new source..."))); integer src_id = SourceManager::newSources[0]:0; - map data = Pkg::SourceGeneralData (src_id); - y2milestone("Adding product: %1", data); - string url = data["url"]:""; - string product_dir = data["product_dir"]:""; - y2milestone ("Deleting source %1", src_id); - Pkg::SourceDelete (src_id); - src_id = Pkg::SourceCreate (url, product_dir); - SourceManager::newSources = [src_id]; + + // BNC #481828: Using LABEL from content file as a repository name + Packages::AdjustSourcePropertiesAccordingToProduct (src_id); // a little hack because of packager leaving // windows open... @@ -309,16 +308,6 @@ } } - if (src_id == -1) - { - // error report - Report::Error (_("Failed to initialize the software repository.")); - AddOnProduct::ClearRegistrationRequest (src_id); - - y2milestone ("CatalogSelect Dialog ret: %1", AddOnProduct::last_ret); - return `finish; - } - AddOnProduct::src_id = src_id; SourceManager::newSources = [src_id]; y2milestone ("Only one source available - skipping dialog"); @@ -326,6 +315,7 @@ y2milestone ("CatalogSelect Dialog ret: %1", AddOnProduct::last_ret); return AddOnProduct::last_ret; } + y2milestone ("Running catalog select dialog"); list catalogs = maplist (integer src, sources, { map data = Pkg::SourceGeneralData (src); @@ -360,17 +350,8 @@ if (ret == `abort || ret == `cancel) { ret = `abort; -// if (Stage::initial()) -// { -// if (Popup::ConfirmAbort (`painless)) -// break; -// } -// else -// { - // yes-no popup - if (Popup::YesNo (_("Really abort add-on product installation?"))) - break; -// } + if (Popup::YesNo (_("Really abort add-on product installation?"))) + break; continue; } else if (ret == `back) @@ -401,26 +382,13 @@ foreach (integer src, SourceManager::newSources, { if (src != selected) { - y2milestone ("Deleting source %1", src); + y2milestone ("Deleting unused source %1", src); Pkg::SourceDelete (src); } }); - map data = Pkg::SourceGeneralData (selected); - string url = data["url"]:""; - string product_dir = data["product_dir"]:""; - y2milestone ("Deleting source %1", selected); - Pkg::SourceDelete (selected); - selected = Pkg::SourceCreate (url, product_dir); - SourceManager::newSources = [selected]; - if (selected == -1) - { - // error report - Report::Error (_("Failed to initialize the software repository.")); - AddOnProduct::ClearRegistrationRequest (selected); - y2milestone ("CatalogSelect Dialog ret: %1", `finish); - return `finish; - } + // BNC #481828: Using LABEL from content file as a repository name + Packages::AdjustSourcePropertiesAccordingToProduct (selected); AddOnProduct::src_id = selected; SourceManager::newSources = [selected]; Modified: trunk/add-on/yast2-add-on.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/yast2-add-on.spec.in?rev=… ============================================================================== --- trunk/add-on/yast2-add-on.spec.in (original) +++ trunk/add-on/yast2-add-on.spec.in Fri Apr 3 14:35:02 2009 @@ -7,8 +7,8 @@ Requires: yast2-installation Requires: yast2-country -# repositories_include.ycp -Requires: yast2-packager >= 2.16.47 +# Packages::AdjustSourcePropertiesAccordingToProduct +Requires: yast2-packager >= 2.18.4 # bugzilla #335582, new API for StorageDevices Requires: yast2-storage >= 2.16.1 -- 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] r56620 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/Packages.ycp
by locilka＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: locilka Date: Fri Apr 3 14:33:08 2009 New Revision: 56620 URL: http://svn.opensuse.org/viewcvs/yast?rev=56620&view=rev Log: - Adjusting initial repository name according to LABEL in content file. Exporting the same function for Add-Ons (bnc #481828). - 2.18.4 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=56620&r1=56… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Fri Apr 3 14:33:08 2009 @@ -1 +1 @@ -2.18.3 +2.18.4 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Apr 3 14:33:08 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Apr 3 14:31:20 CEST 2009 - locilka(a)suse.cz + +- Adjusting initial repository name according to LABEL in content + file. Exporting the same function for Add-Ons (bnc #481828). +- 2.18.4 + +------------------------------------------------------------------- Mon Mar 30 14:41:21 CEST 2009 - lslezak(a)suse.cz - sw_single - display the installation summary when there is Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Fri Apr 3 14:33:08 2009 @@ -1345,6 +1345,81 @@ return true; } +/** + * Adjusts repository name according to LABEL in content file + * or a first product found on the media (as a fallback). + * + * @param integer repository ID + * @return boolean if successful + * + * @see BNC #481828 + */ +global boolean AdjustSourcePropertiesAccordingToProduct (integer src_id) { + // This function is used from several places (also YaST Add-On) + + if (src_id == nil || src_id < 0) { + y2error ("Wrong source ID: %1", src_id); + return nil; + } + + y2milestone ("Trying to adjust repository name for: %1", src_id); + string new_name = nil; + + // At first, try LABEL from content file + string contentfile = Pkg::SourceProvideSignedFile (src_id, 1, "/content", true /* optional */); + if (contentfile != nil) { + map contentmap = (map) SCR::Read (.content_file, contentfile); + if (haskey (contentmap, "LABEL") && contentmap["LABEL"]:nil != nil && contentmap["LABEL"]:"" != "") { + new_name = contentmap["LABEL"]:""; + + if (regexpmatch (new_name, "^\[ \t\]\+")) + new_name = regexpsub (new_name, "^\[ \t\]\+(.*)", "\\1"); + if (regexpmatch (new_name, "\[ \t\]\+$")) + new_name = regexpsub (new_name, "(.*)\[ \t\]\+$", "\\1"); + + y2milestone ("Using LABEL from content file: %1", new_name); + } else { + y2warning ("No (useful) LABEL in product content file"); + } + } + + // As a fallback, + if (new_name == nil || new_name == "") { + y2milestone ("Trying to get repository name from products"); + list <map <string, any> > all_products = Pkg::ResolvableProperties ("", `product, ""); + foreach (map <string, any> one_product, all_products, { + // source ID matches + if (one_product["source"]:-1 == src_id) { + if (haskey (one_product, "name") && one_product["name"]:nil != nil && one_product["name"]:"" != "") { + new_name = one_product["name"]:""; + y2milestone ("Product name found: %1", new_name); + break; + } + } + }); + } + + // Finally, some (new) name has been adjusted + if (new_name != nil && new_name != "") { + y2milestone ("Adjusting repository name"); + list <map <string, any> > sources_got = Pkg::SourceEditGet(); + list <map <string, any> > sources_set = []; + foreach (map <string, any> one_source, sources_got, { + if (one_source["SrcId"]:-1 == src_id) { + one_source["name"] = new_name; + } + sources_set = add (sources_set, one_source); + }); + + return Pkg::SourceEditSet (sources_set); + // Bad luck, nothing useful found + } else { + y2warning ("No name found"); + + return false; + } +} + global void Initialize_StageInitial (boolean show_popup, string base_url, string log_url) { integer initial_source = nil; ImportGPGKeys (); @@ -1383,6 +1458,9 @@ } } + // BNC #481828: Using LABEL from content file as a repository name + AdjustSourcePropertiesAccordingToProduct (base_source_id); + base_source_id = initial_source; y2milestone ("Base source ID: %1", base_source_id); -- 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] r56619 - /trunk/storage/libstorage/src/StorageInterface.h
by aschnell＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: aschnell Date: Fri Apr 3 14:02:58 2009 New Revision: 56619 URL: http://svn.opensuse.org/viewcvs/yast?rev=56619&view=rev Log: - mark volcnt as deprecated Modified: trunk/storage/libstorage/src/StorageInterface.h Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Fri Apr 3 14:02:58 2009 @@ -166,7 +166,7 @@ { ContainerInfo() {} CType type; - unsigned volcnt; + unsigned volcnt; // deprecated string device; string name; UsedByType usedByType; -- 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] r56618 - in /branches/tmp/SLE-11-SP1-Stash/yast2: ./ library/agents/ library/control/src/ library/modules/ library/network/agents/ library/network/testsuite/tests/ library/packages/src/ package/
by lslezak＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: lslezak Date: Fri Apr 3 14:02:51 2009 New Revision: 56618 URL: http://svn.opensuse.org/viewcvs/yast?rev=56618&view=rev Log: - Do not display "No package source" popup, just log a warning (bnc#485587) Modified: branches/tmp/SLE-11-SP1-Stash/yast2/ (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/agents/etc_ssh_sshd_config.scr (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/control/src/InstExtensionImage.ycp (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/modules/ConfigHistory.ycp (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/network/agents/network.scr.in (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/network/agents/sysconfig_SuSEfirewall2.scr (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/network/testsuite/tests/NetworkInterfaces.err (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/network/testsuite/tests/NetworkInterfaces.out (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/network/testsuite/tests/NetworkInterfaces2.err (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/network/testsuite/tests/NetworkInterfaces2.out (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/network/testsuite/tests/NetworkInterfaces3.err (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/network/testsuite/tests/NetworkInterfaces3.out (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/network/testsuite/tests/NetworkInterfaces3.ycp (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/network/testsuite/tests/NetworkInterfaces4.err (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/network/testsuite/tests/NetworkInterfaces4.out (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/network/testsuite/tests/NetworkInterfaces4.ycp (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackageSystem.ycp branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackagesProposal.ycp (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackagesUI.ycp (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/SlideShow.ycp (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/Slides.ycp (props changed) branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes Modified: branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackageSystem.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/yast2/li… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackageSystem.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackageSystem.ycp Fri Apr 3 14:02:51 2009 @@ -86,11 +86,10 @@ { source_initialized = true; } - // ignore the problem when installing from LiveCD - all sources are disabled - else if (!Mode::live_installation()) + else { - /* Error message, no packages sources found */ - Report::Error(_("No package source defined.")); + // all repositories are disabled or no repository defined + y2warning("No package repository available"); } } Modified: branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/yast2/pa… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes Fri Apr 3 14:02:51 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 3 13:26:58 CEST 2009 - lslezak(a)suse.cz + +- Do not display "No package source" popup, just log a warning + (bnc#485587) + +------------------------------------------------------------------- Wed Mar 18 13:08:36 CET 2009 - ug(a)suse.de - read X-SuSE-DocTeamID from desktop files (bnc#448238) -- 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] r56617 - in /trunk/yast2: library/packages/src/PackageSystem.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 03 Apr '09

03 Apr '09

Author: lslezak Date: Fri Apr 3 13:55:57 2009 New Revision: 56617 URL: http://svn.opensuse.org/viewcvs/yast?rev=56617&view=rev Log: - Do not display "No package source" popup, just log a warning (bnc#485587) Modified: trunk/yast2/library/packages/src/PackageSystem.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/packages/src/PackageSystem.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageSystem.ycp (original) +++ trunk/yast2/library/packages/src/PackageSystem.ycp Fri Apr 3 13:55:57 2009 @@ -86,11 +86,10 @@ { source_initialized = true; } - // ignore the problem when installing from LiveCD - all sources are disabled - else if (!Mode::live_installation()) + else { - /* Error message, no packages sources found */ - Report::Error(_("No package source defined.")); + // all repositories are disabled or no repository defined + y2warning("No package repository available"); } } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Apr 3 13:55:57 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 3 13:26:58 CEST 2009 - lslezak(a)suse.cz + +- Do not display "No package source" popup, just log a warning + (bnc#485587) + +------------------------------------------------------------------- Fri Apr 3 12:29:54 CEST 2009 - jsrain(a)suse.cz - save_y2logs additionally collects /var/log/zypper.log and -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0