October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52344 - in /trunk/registration: VERSION package/yast2-registration.changes src/modules/Register.ycp src/modules/YSR.pm
by jdsn＠svn.opensuse.org 17 Oct '08

17 Oct '08

Author: jdsn Date: Fri Oct 17 18:40:35 2008 New Revision: 52344 URL: http://svn.opensuse.org/viewcvs/yast?rev=52344&view=rev Log: - fix to display correct text in manual interaction (bnc#435869) - refresh services after creating them - 2.17.6 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/modules/Register.ycp trunk/registration/src/modules/YSR.pm Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=52344&r… ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Fri Oct 17 18:40:35 2008 @@ -1 +1 @@ -2.17.5 +2.17.6 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Fri Oct 17 18:40:35 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 17 18:03:34 CEST 2008 - jdsn(a)suse.de + +- fix to display correct text in manual interaction (bnc#435869) +- refresh services after creating them +- 2.17.6 + +------------------------------------------------------------------- Fri Oct 17 17:17:50 CEST 2008 - jdsn(a)suse.de - display correct text during manual interaction (bnc#435869) Modified: trunk/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/Registe… ============================================================================== --- trunk/registration/src/modules/Register.ycp (original) +++ trunk/registration/src/modules/Register.ycp Fri Oct 17 18:40:35 2008 @@ -358,6 +358,18 @@ string urlError = _("Downloading SMT certificate file failed"); symbol errret = certificateError( urlError, `url); + if ( errret == `yes ) + { + y2warning("No SMT certificate could be retrieved (floppy mount error). User selected to skip Registration."); + return `silentskip; + } + else if ( errret == `no ) + { + y2warning("No SMT certificate could be retrieved (floppy mount error). User selected to NOT skip Registration. Most likely Registration will fail now."); + return `ok; + } + else { certmode = `ask; } + certTmpFile = nil; } } @@ -527,6 +539,12 @@ // log certificate details + if ( certTmpFile == nil || certTmpFile == "" ) + { + y2error("Copying the CA certificate file failed"); + return `conferror; + } + map cP = RegisterCert::parseCertificate(certTmpFile); y2milestone("SMT certificate file information: %1", cP); @@ -1125,6 +1143,17 @@ y2error("A service returned by SuseRegister did not contain any catalogs."); repoUpdateSuccessful = false; } + + // we may have changed something - so lets refresh now + if ( Pkg::ServiceRefresh(pService) ) + { + y2milestone("Successfully refreshed service: %1", pService); + } + else + { + y2error("Could not refresh service: %1", pService); + } + } else if ( ((map) pAny)["TASK"]:"" == "a" ) { @@ -1150,30 +1179,30 @@ // if ( Pkg::ServiceSave(pService) ) // function not yet available if ( Pkg::SourceSaveAll() ) { - y2milestone("Successfully saved services."); + y2milestone("Successfully saved service: %1.", pService); + // then iterate over catalogs + any catalogsMap = ((map) pAny)["CATALOGS"]:$[]; + if ( is( catalogsMap , map) && catalogsMap != $[] ) + { + y2milestone("A new service returned by SuseRegister has catalogs that will be checked now."); + list<string> cSummary = checkCatalogs( (map<string, any>) catalogsMap, pService ); + summary = (list<string>) merge(summary, cSummary); + } + else + { + y2error("A new service returned by SuseRegister did not contain any catalogs."); + repoUpdateSuccessful = false; + } + + // we may have changed something - so lets refresh now if ( Pkg::ServiceRefresh(pService) ) { y2milestone("Successfully refreshed service: %1", pService); - - // then iterate over catalogs - any catalogsMap = ((map) pAny)["CATALOGS"]:$[]; - if ( is( catalogsMap , map) && catalogsMap != $[] ) - { - y2milestone("A new service returned by SuseRegister has catalogs that will be checked now."); - list<string> cSummary = checkCatalogs( (map<string, any>) catalogsMap, pService ); - summary = (list<string>) merge(summary, cSummary); - } - else - { - y2error("A new service returned by SuseRegister did not contain any catalogs."); - repoUpdateSuccessful = false; - } } else { y2error("Could not refresh service: %1", pService); - repoUpdateSuccessful = false; } } else Modified: trunk/registration/src/modules/YSR.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/YSR.pm?… ============================================================================== --- trunk/registration/src/modules/YSR.pm (original) +++ trunk/registration/src/modules/YSR.pm Fri Oct 17 18:40:35 2008 @@ -137,7 +137,7 @@ { my $self = shift; - return $global_ctx->{registerReadableText}; + return join('', @{$global_ctx->{registerReadableText}}); } BEGIN { $TYPEINFO{get_registerPrivPol} = [ "function", "string"]; } -- 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] r52343 - in /branches/tmp/coolo/update_yast_repo: last_rev_yast last_rev_zypp
by dmacvicar＠svn.opensuse.org 17 Oct '08

17 Oct '08

Author: dmacvicar Date: Fri Oct 17 17:39:12 2008 New Revision: 52343 URL: http://svn.opensuse.org/viewcvs/yast?rev=52343&view=rev Log: update Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast branches/tmp/coolo/update_yast_repo/last_rev_zypp Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_yast (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_yast Fri Oct 17 17:39:12 2008 @@ -1 +1 @@ -52318 +52343 Modified: branches/tmp/coolo/update_yast_repo/last_rev_zypp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_zypp (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_zypp Fri Oct 17 17:39:12 2008 @@ -1 +1 @@ -11386 +11395 -- 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] r52342 - in /branches/tmp/coolo/update_yast_repo: last_rev_yast last_rev_zypp
by dmacvicar＠svn.opensuse.org 17 Oct '08

17 Oct '08

Author: dmacvicar Date: Fri Oct 17 17:20:12 2008 New Revision: 52342 URL: http://svn.opensuse.org/viewcvs/yast?rev=52342&view=rev Log: update Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast branches/tmp/coolo/update_yast_repo/last_rev_zypp Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_yast (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_yast Fri Oct 17 17:20:12 2008 @@ -1 +1 @@ -52311 +52318 Modified: branches/tmp/coolo/update_yast_repo/last_rev_zypp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_zypp (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_zypp Fri Oct 17 17:20:12 2008 @@ -1 +1 @@ -11385 +11386 -- 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] r52341 - /tags/stable-2_17_5/registration/
by jdsn＠svn.opensuse.org 17 Oct '08

17 Oct '08

Author: jdsn Date: Fri Oct 17 17:19:21 2008 New Revision: 52341 URL: http://svn.opensuse.org/viewcvs/yast?rev=52341&view=rev Log: Created tag stable-2_17_5 for registration Added: tags/stable-2_17_5/registration/ - copied from r52340, trunk/registration/ -- 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] r52340 - in /trunk/registration: VERSION package/yast2-registration.changes src/clients/inst_suse_register.ycp src/modules/Register.ycp src/modules/YSR.pm yast2-registration.spec.in
by jdsn＠svn.opensuse.org 17 Oct '08

17 Oct '08

Author: jdsn Date: Fri Oct 17 17:19:12 2008 New Revision: 52340 URL: http://svn.opensuse.org/viewcvs/yast?rev=52340&view=rev Log: - display correct text during manual interaction (bnc#435869) - fix repeated initializations of suseRegister - ask to trust CA certificate of registration server (port from SP2) - spec file clean up - 2.17.5 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/clients/inst_suse_register.ycp trunk/registration/src/modules/Register.ycp trunk/registration/src/modules/YSR.pm trunk/registration/yast2-registration.spec.in Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=52340&r… ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Fri Oct 17 17:19:12 2008 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Fri Oct 17 17:19:12 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Oct 17 17:17:50 CEST 2008 - jdsn(a)suse.de + +- display correct text during manual interaction (bnc#435869) +- fix repeated initializations of suseRegister +- ask to trust CA certificate of registration server (port from SP2) +- spec file clean up +- 2.17.5 + +------------------------------------------------------------------- Thu Oct 16 13:12:43 CEST 2008 - jdsn(a)suse.de - call to saveLastZmdConfig added (bnc#435696) Modified: trunk/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/inst_su… ============================================================================== --- trunk/registration/src/clients/inst_suse_register.ycp (original) +++ trunk/registration/src/clients/inst_suse_register.ycp Fri Oct 17 17:19:12 2008 @@ -770,7 +770,9 @@ if ( SRstatus == 1 ) { // get the details overview - manual_interaction_overview = Register::suseRegisterListParams(); + manual_interaction_overview = YSR::get_registerReadableText(); // (bnc#435869) + if ( manual_interaction_overview == nil ) manual_interaction_overview = ""; + UI::OpenDialog( manual_interaction ); UI::SetFocus (`id (`start_browser )); UI::ChangeWidget( `id(`needinfo), `Value, manual_interaction_overview ); Modified: trunk/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/Registe… ============================================================================== --- trunk/registration/src/modules/Register.ycp (original) +++ trunk/registration/src/modules/Register.ycp Fri Oct 17 17:19:12 2008 @@ -25,6 +25,7 @@ import "ProductFeatures"; import "SourceManager"; import "Installation"; +import "RegisterCert"; // -------------------------------------------------------------- // START: Locally defined data @@ -313,9 +314,9 @@ string certTmpFile = sformat("%1/__tmpSMTcert.crt", SCR::Read(.target.tmpdir)); // check for existing certificate (bnc#376000) - integer certExists = nil; - certExists = (integer) SCR::Execute(.target.bash, sformat("[ -f %1 ]", smtpemFile)); - if (certmode != `url && certExists == 0) + boolean certExists = false; + certExists = ( (integer) SCR::Execute(.target.bash, sformat("[ -f %1 ]", smtpemFile)) == 0 ) ? true:false; + if (certmode != `url && certExists ) { // do nothing to refetch the certificate if manual interaction is necessary y2milestone("Existing SMT certificate found and keeping it. To renew the SMT certificate please assign a URL as value to the key 'regcert' in /var/lib/YaST2/install.inf"); @@ -343,7 +344,7 @@ string curlcmd = sformat("curl -f --connect-timeout 60 --max-time 120 '%1' -o %2", smt_server_cert, certTmpFile); if ( SCR::Execute(.target.bash, curlcmd) != 0) { - if (certExists == 0) + if ( certExists ) { // do nothing to refetch the certificate if manual interaction is necessary y2milestone("Could not download the current SMT certificate but existing certificate found and keeping it. To renew the SMT certificate please make sure it is available on the registration server."); @@ -525,17 +526,19 @@ } + // log certificate details + map cP = RegisterCert::parseCertificate(certTmpFile); + y2milestone("SMT certificate file information: %1", cP); + // now ask user if he trusts the certificate // in autoYaST mode we automatically trust if ( !ay ) // (bnc#377929) { - // ask user if he trusts the certificate - // compare with existing certificate (bnc#376000) - if (certExists == 0) + if ( certExists ) { - // we can only test if the files match - no parsing possible - if ( ((integer)SCR::Execute(.target.bash, sformat("diff %1 %2", certTmpFile, smtpemFile)) == 0 )) + map orig_cP = RegisterCert::parseCertificate(smtpemFile); + if (orig_cP["FINGERPRINT"]:"foo" == cP["FINGERPRINT"]:"bar" ) { // return `ok if fingerprints match - no need to ask again y2milestone("Current SMT certificate is up to date and will be kept."); @@ -547,7 +550,46 @@ string trustMessage = _("This certificate will be used to connect to the SMT server.\nYou have to trust this certificate in order to continue with the Registration."); string certInfo = ""; - certInfo = (string) SCR::Read(.target.string, certTmpFile ); + + list issueList = (list) cP["ISSUER"]:[]; + //translators: this is certificate context + certInfo = certInfo + _("Issued For:"); + if (size (issueList) > 0) + { + certInfo = certInfo + "<pre>"; + foreach (map<string,string> keyval, (list<map<string,string> >) issueList, { + foreach (string key, string val, (map<string, string>) keyval, { + certInfo = certInfo + sformat("\n%1: %2", key, val); + }); + }); + certInfo = certInfo + "</pre>"; + } + + //translators: this is certificate context + certInfo = certInfo + _("Subject:"); + list subjectList=(list) cP["SUBJECT"]:[]; + if (size (subjectList) > 0) + { + certInfo = certInfo + "<pre>"; + foreach (map<string, string> keyval, (list<map<string,string> >) subjectList, { + foreach (string key, string val, (map<string,string>)keyval, { + certInfo = certInfo + sformat("\n%1: %2", key, val); + }); + }); + certInfo = certInfo + "</pre>"; + } + //translators: this is certificate context + certInfo = certInfo + _("Validity:"); + certInfo = certInfo + "<pre>"; + //translators: this is certificate context + certInfo = certInfo + "\n" + _("Valid from: ") + " " + cP["STARTDATE"]:""; + //translators: this is certificate context + certInfo = certInfo + "\n" + _("Valid to: ") + " " + cP["ENDDATE"]:""; + //translators: this is certificate context + certInfo = certInfo + "\n" + _("Fingerprint: ") + " " + cP["FINGERPRINT"]:""; + certInfo = certInfo + "</pre>"; + + // certInfo = (string) SCR::Read(.target.string, certTmpFile ); // show the certificate file content -- for debugging only UI::OpenDialog( `MinSize(70, 20, `VBox( `Left( `Label(`opt(`boldFont), trustQuestion)), @@ -1105,8 +1147,8 @@ summary = add(summary, sformat(_("Added Service: %1"), pService )); // because the Pkg bindings do not operate on the system directly we need to save them before we can continue -// if ( Pkg::ServiceSave ) // function not yet available - if ( true ) +// if ( Pkg::ServiceSave(pService) ) // function not yet available + if ( Pkg::SourceSaveAll() ) { y2milestone("Successfully saved services."); Modified: trunk/registration/src/modules/YSR.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/YSR.pm?… ============================================================================== --- trunk/registration/src/modules/YSR.pm (original) +++ trunk/registration/src/modules/YSR.pm Fri Oct 17 17:19:12 2008 @@ -24,6 +24,12 @@ my $self = shift; my $data = shift; + if(defined $global_ctx && ref($global_ctx) eq "HASH" && exists $global_ctx->{debug}) + { + # ctx is initialized; clean it before we re-init it + $self->del_ctx(); + } + $global_ctx = SUSE::SuseRegister::init_ctx($data); } Modified: trunk/registration/yast2-registration.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/yast2-registration.… ============================================================================== --- trunk/registration/yast2-registration.spec.in (original) +++ trunk/registration/yast2-registration.spec.in Fri Oct 17 17:19:12 2008 @@ -1,19 +1,19 @@ @HEADER-COMMENT@ @HEADER@ -Requires: yast2 >= 2.16.6 +Requires: yast2 >= 2.17.0 +Requires: yast2-packager >= 2.17.0 Requires: suseRegister -# because of SourceManager -Requires: yast2-packager >= 2.13.152 +Requires: mozilla-xulrunner190 +Requires: perl-TimeDate limal limal-perl limal-ca-mgm-perl +Requires: yast2-pkg-bindings -Requires: mozilla-xulrunner190 - -PreReq: %fillup_prereq +PreReq: %fillup_prereq +BuildRequires: yast2 >= 2.17.0 BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-packager -# Internet YCP module -BuildRequires: yast2 >= 2.16.6 -BuildRequires: suseRegister sles-release perl-libwww-perl perl-URI perl-Crypt-SSLeay +BuildRequires: perl-TimeDate limal limal-perl limal-ca-mgm-perl +BuildRequires: suseRegister sles-release BuildArchitectures: noarch @@ -27,11 +27,11 @@ @BUILD@ @INSTALL@ -%if %sles_version - rm $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/suse_register.desktop -%else - rm $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/customer_center.desktop -%endif +#%if %sles_version +# rm $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/suse_register.desktop +#%else +# rm $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/customer_center.desktop +#%endif @CLEAN@ -- 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] r52339 - /tags/stable-2_17_20/pkg-bindings/
by lslezak＠svn.opensuse.org 17 Oct '08

17 Oct '08

Author: lslezak Date: Fri Oct 17 16:03:59 2008 New Revision: 52339 URL: http://svn.opensuse.org/viewcvs/yast?rev=52339&view=rev Log: Created tag stable-2_17_20 for pkg-bindings Added: tags/stable-2_17_20/pkg-bindings/ - copied from r52338, trunk/pkg-bindings/ -- 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] r52338 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Package.cc
by lslezak＠svn.opensuse.org 17 Oct '08

17 Oct '08

Author: lslezak Date: Fri Oct 17 16:00:43 2008 New Revision: 52338 URL: http://svn.opensuse.org/viewcvs/yast?rev=52338&view=rev Log: - 2.17.20 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Package.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=52338&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Fri Oct 17 16:00:43 2008 @@ -1 +1 @@ -2.17.19 +2.17.20 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Fri Oct 17 16:00:43 2008 @@ -8,6 +8,7 @@ to the deleted service, similar fix in enabling/disabling a service via ServiceSet() (bnc#435711) - fixed network detection command (bnc#435970) +- 2.17.20 ------------------------------------------------------------------- Wed Oct 15 10:56:06 CEST 2008 - lslezak(a)suse.cz Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Fri Oct 17 16:00:43 2008 @@ -1505,7 +1505,7 @@ /** * @builtin PkgUpdateAll - * @param map<string,any> update_options Options for the solver. All parameters are optional, if a parameter is missing the default value from the package manager (libzypp) is used. Currently supported options: <tt>$["delete_unmaintained":boolean, "silent_downgrades":boolean, "keep_installed_patches":boolean]</tt> + * @param map<string,any> update_options Options for the solver. All parameters are optional, if a parameter is missing the default value from the package manager (libzypp) is used. Currently supported options: <tt>$["silent_downgrades":boolean] </tt> * @short Update installed packages * @description * Mark all packages for installation which are installed and have -- 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] r52337 - /tags/stable-2_17_29/bootloader/
by juhliarik＠svn.opensuse.org 17 Oct '08

17 Oct '08

Author: juhliarik Date: Fri Oct 17 15:51:39 2008 New Revision: 52337 URL: http://svn.opensuse.org/viewcvs/yast?rev=52337&view=rev Log: Created tag stable-2_17_29 for bootloader Added: tags/stable-2_17_29/bootloader/ - copied from r52336, trunk/bootloader/ -- 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] r52336 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes scripts/update_gfxmenu yast2-bootloader.spec.in
by juhliarik＠svn.opensuse.org 17 Oct '08

17 Oct '08

Author: juhliarik Date: Fri Oct 17 15:51:29 2008 New Revision: 52336 URL: http://svn.opensuse.org/viewcvs/yast?rev=52336&view=rev Log: - added fix for problem with laguage - update dependecies Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/scripts/update_gfxmenu trunk/bootloader/yast2-bootloader.spec.in Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=52336&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Fri Oct 17 15:51:29 2008 @@ -1 +1 @@ -2.17.28 +2.17.29 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Fri Oct 17 15:51:29 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 17 14:58:02 CEST 2008 - juhliarik(a)suse.cz + +- added fix for adding language to GRUB (bnc #429287) +- 2.17.29 + +------------------------------------------------------------------- Thu Oct 16 15:24:21 CEST 2008 - juhliarik(a)suse.cz - added fix for using autoyast profil from SLES9 (bnc #344659) Modified: trunk/bootloader/scripts/update_gfxmenu URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/scripts/update_gfxmen… ============================================================================== --- trunk/bootloader/scripts/update_gfxmenu (original) +++ trunk/bootloader/scripts/update_gfxmenu Fri Oct 17 15:51:29 2008 @@ -38,13 +38,17 @@ # set translations of bootloaer menu entries cp $MENU_ENTRIES ./translations.$LOCALE || exit 7; else - if [ "$LOCALE_SHORT" = "en" ]; then - echo -n "en - " >languages || exit 6 + if [ -f $SRC_DIR/$LOCALE_SHORT.tr ]; then + echo -n $LOCALE > languages || exit 6 else - echo -n "$LOCALE_SHORT - en - " >languages || exit 6 + + if [ "$LOCALE_SHORT" = "en" ]; then + echo -n "en_US + " >languages || exit 6 + else + echo -n "$LOCALE_SHORT + " >languages || exit 6 + fi fi # set translations of bootloaer menu entries Modified: trunk/bootloader/yast2-bootloader.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/yast2-bootloader.spec… ============================================================================== --- trunk/bootloader/yast2-bootloader.spec.in (original) +++ trunk/bootloader/yast2-bootloader.spec.in Fri Oct 17 15:51:29 2008 @@ -6,8 +6,12 @@ #!BuildIgnore: autoyast2-installation PreReq: /bin/sed %fillup_prereq # Installation::*version variables -Requires: yast2 >= 2.17.0 +Requires: yast2 >= 2.17.36 +Requires: yast2-packager >= 2.17.24 Requires: yast2-core yast2-storage perl-Bootloader parted perl-Compress-Zlib limal-perl +BuildRequires: yast2 >= 2.17.36 +BuildRequires: yast2-packager >= 2.17.24 + %ifarch %ix86 x86_64 Requires: master-boot-code %endif -- 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] r52335 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Service.cc
by lslezak＠svn.opensuse.org 17 Oct '08

17 Oct '08

Author: lslezak Date: Fri Oct 17 15:26:34 2008 New Revision: 52335 URL: http://svn.opensuse.org/viewcvs/yast?rev=52335&view=rev Log: - ServiceGet()/ServiceSet() - query/set ReposToEnable and ReposToDisable (bnc#435669) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Service.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Fri Oct 17 15:26:34 2008 @@ -1,6 +1,8 @@ ------------------------------------------------------------------- Fri Oct 17 12:06:44 CEST 2008 - lslezak(a)suse.cz +- ServiceGet()/ServiceSet() - query/set ReposToEnable and + ReposToDisable (bnc#435669) - added ServiceSave() function (bnc#435669) - fixed ServiceDelete() - delete also the repositories belonging to the deleted service, similar fix in enabling/disabling Modified: trunk/pkg-bindings/src/Service.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Service.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Service.cc (original) +++ trunk/pkg-bindings/src/Service.cc Fri Oct 17 15:26:34 2008 @@ -165,7 +165,7 @@ @builtin ServiceGet @short Get detailed properties of a service @param alias alias of the service - @return map Service data in map $[ "alias":string, "name":string, "url":string, "autorefresh":boolean, "enabled":boolean, "file":string ]. "file" is name of the file from which the service has been read, it is empty if the service has not been saved yet + @return map Service data in map $[ "alias":string, "name":string, "url":string, "autorefresh":boolean, "enabled":boolean, "file":string, "repos_to_disable" : list<string>, "repos_to_enable" : list<string> ]. "file" is name of the file from which the service has been read, it is empty if the service has not been saved yet */ YCPValue PkgFunctions::ServiceGet(const YCPString &alias) { @@ -185,6 +185,30 @@ ret->add(YCPString("enabled"), YCPBoolean(s.enabled())); ret->add(YCPString("file"), YCPString(s.filepath().asString())); + if (s.reposToDisableSize() > 0) + { + YCPList lst; + + for_(it, s.reposToDisableBegin(), s.reposToDisableEnd()) + { + lst->add(YCPString(*it)); + } + + ret->add(YCPString("repos_to_disable"), lst); + } + + if (s.reposToEnableSize() > 0) + { + YCPList lst; + + for_(it, s.reposToEnableBegin(), s.reposToEnableEnd()) + { + lst->add(YCPString(*it)); + } + + ret->add(YCPString("repos_to_enable"), lst); + } + return ret; } @@ -278,6 +302,48 @@ } } + v = service->value(YCPString("repos_to_disable")); + if(!v.isNull() && v->isList()) + { + // clear the list + s.clearReposToDisable(); + + YCPList lst = v->asList(); + + for (int index = 0; index < lst->size(); ++index) + { + if( ! lst->value(index)->isString() ) + { + y2error( "repos_to_disable: value at index %d is not a string: %s", index, lst->toString().c_str()); + } + + std::string disable_alias(lst->value(index)->asString()->value()); + y2milestone("Adding repository to disable: %s", disable_alias.c_str()); + s.addRepoToDisable(disable_alias); + } + } + + v = service->value(YCPString("repos_to_enable")); + if(!v.isNull() && v->isList()) + { + // clear the list + s.clearReposToEnable(); + + YCPList lst = v->asList(); + + for (int index = 0; index < lst->size(); ++index) + { + if( ! lst->value(index)->isString() ) + { + y2error( "repos_to_enable: value at index %d is not a string: %s", index, lst->toString().c_str()); + } + + std::string enable_alias(lst->value(index)->asString()->value()); + y2milestone("Adding repository to enable: %s", enable_alias.c_str()); + s.addRepoToEnable(enable_alias); + } + } + // note: do not allow to change the file name? return YCPBoolean(service_manager.SetService(old_alias->value(), s)); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0