October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41627 - /trunk/ca-management/package/yast2-ca-management.changes
by mcalmer＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: mcalmer Date: Mon Oct 29 18:10:50 2007 New Revision: 41627 URL: http://svn.opensuse.org/viewcvs/yast?rev=41627&view=rev Log: update changes Modified: trunk/ca-management/package/yast2-ca-management.changes Modified: trunk/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/package/yast2-ca-m… ============================================================================== --- trunk/ca-management/package/yast2-ca-management.changes (original) +++ trunk/ca-management/package/yast2-ca-management.changes Mon Oct 29 18:10:50 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 29 18:10:12 CET 2007 - mc(a)suse.de + +- merge SP1 changes to trunk + * detect existing default Root CA during installation (#238754) +- popup password dialog if root password cannot be read + +------------------------------------------------------------------- Mon Oct 29 16:12:36 CET 2007 - mc(a)suse.de - version 2.16.2 -- 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] r41626 - /trunk/ca-management/src/ca_mgm_proposal.ycp
by mcalmer＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: mcalmer Date: Mon Oct 29 18:10:02 2007 New Revision: 41626 URL: http://svn.opensuse.org/viewcvs/yast?rev=41626&view=rev Log: - merge SP1 changes to trunk * detect existing default Root CA during installation (#238754) - popup password dialog if root password cannot be read Modified: trunk/ca-management/src/ca_mgm_proposal.ycp Modified: trunk/ca-management/src/ca_mgm_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/ca_mgm_proposa… ============================================================================== --- trunk/ca-management/src/ca_mgm_proposal.ycp (original) +++ trunk/ca-management/src/ca_mgm_proposal.ycp Mon Oct 29 18:10:02 2007 @@ -26,6 +26,7 @@ import "DNS"; import "Timezone"; import "Users"; + import "String"; include "ca-management/new_cert_read_write.ycp"; @@ -36,203 +37,306 @@ if (func == "MakeProposal") { - boolean force_reset = param["force_reset"]:false; - string proposal = ""; - string warning = nil; - symbol warning_level = nil; - - map retmap = (map) SCR::Execute (.target.bash_output, - "/bin/hostname --long", - $[] ); - y2milestone("Hostname :%1", retmap); - if (retmap["exit"]:0 != 0 - && CaMgm::prop_selection == `def - && (!CaMgm::prop_server_commonNameChanged - || !CaMgm::prop_emailChanged - || force_reset)) - { - ret = add( ret, "warning", _("Cannot evaluate the name of the local machine. Change the values of Server Name and E-Mail.")); - ret = add( ret, "warning_level", `blocker ); - } - - string longhostname = strip(retmap["stdout"]:"linux.site"); - if(size(longhostname) <= 0) - { - longhostname = "linux.site"; - } - string hostname = ((list<string>) splitstring (longhostname, "."))[0]:""; - string domain = substring (longhostname, findfirstof(longhostname,".")+1); - - if (size (domain) <= 0) - { - domain = longhostname; - } - - if (!CaMgm::prop_ca_commonNameChanged) - { - CaMgm::prop_ca_commonName = "YaST Default CA (" + hostname + ")"; - } - if (!CaMgm::prop_server_commonNameChanged) - { - CaMgm::prop_server_commonName = longhostname; - } - if (!CaMgm::prop_CANameChanged) - { - CaMgm::prop_CAName = "YaST_Default_CA"; - } - if (!CaMgm::prop_countryChanged) - { - CaMgm::prop_country = Timezone::GetCountryForTimezone(""); - } - if (!CaMgm::prop_passwordChanged) - { - CaMgm::prop_password = Users::GetRootPassword(); - } - if (!CaMgm::prop_emailChanged) - { - CaMgm::prop_email = "postmaster@" + domain; - } - - if(ret["warning"]:"" != "") - { - return ret; - } - - if (force_reset) - { - y2milestone("FORCE RESET"); - if (CaMgm::prop_settingsWritten) - { - if( !Popup::YesNo(_("CA Management") + "\n" + - _("Settings have already been written.") + "\n" + - _("Delete the old settings?"))) - { - ret = $[ "workflow_sequence" : `auto ]; - } - else - { - YaPI::CaManagement::DeleteCA ($[ "caName":CaMgm::currentCA, - "caPasswd":getPassword(CaMgm::currentCA), - "force": true]); - CaMgm::prop_settingsWritten = false; - } - } - else - { - CaMgm::prop_selection = `def; - CaMgm::prop_ca_commonName = "YaST Default CA (" + hostname + ")"; - CaMgm::prop_CAName = "YaST_Default_CA"; - CaMgm::prop_country = Timezone::GetCountryForTimezone(""); - CaMgm::prop_password = Users::GetRootPassword(); - CaMgm::prop_email = "postmaster@" + domain; - CaMgm::prop_server_commonName = longhostname; - } - } - - if (!check_mail_address(CaMgm::prop_email)) - { - ret = add( ret, "warning", _("Invalid e-mail format.")); - ret = add( ret, "warning_level", `blocker ); - } + boolean force_reset = param["force_reset"]:false; + string proposal = ""; + string warning = nil; + symbol warning_level = nil; + + map retmap = (map) SCR::Execute (.target.bash_output, + "/bin/hostname --long", + $[] ); + y2milestone("Hostname :%1", retmap); + if (retmap["exit"]:0 != 0 + && CaMgm::prop_selection == `def + && (!CaMgm::prop_server_commonNameChanged + || !CaMgm::prop_emailChanged + || force_reset)) + { + ret = add( ret, "warning", _("Cannot evaluate the name of the local machine. Change the values of Server Name and E-Mail.")); + ret = add( ret, "warning_level", `blocker ); + } + + string longhostname = strip(retmap["stdout"]:"linux.site"); + if(size(longhostname) <= 0) + { + longhostname = "linux.site"; + } + string hostname = ((list<string>) splitstring (longhostname, "."))[0]:""; + string domain = substring (longhostname, findfirstof(longhostname,".")+1); + + if (size (domain) <= 0) + { + domain = longhostname; + } + + if (!CaMgm::prop_ca_commonNameChanged) + { + CaMgm::prop_ca_commonName = "YaST Default CA (" + hostname + ")"; + } + if (!CaMgm::prop_server_commonNameChanged) + { + CaMgm::prop_server_commonName = longhostname; + } + if (!CaMgm::prop_CANameChanged) + { + CaMgm::prop_CAName = "YaST_Default_CA"; + } + if (!CaMgm::prop_countryChanged) + { + CaMgm::prop_country = Timezone::GetCountryForTimezone(""); + } + if (!CaMgm::prop_passwordChanged) + { + CaMgm::prop_password = Users::GetRootPassword(); + } + if (!CaMgm::prop_emailChanged) + { + CaMgm::prop_email = "postmaster@" + domain; + } + + if(ret["warning"]:"" != "") + { + return ret; + } + - if (CaMgm::prop_selection == `def) - { - if (!CaMgm::prop_passwordChanged) - { - proposal = HTML::Para(_("Creating default CA and certificate.") - + HTML::Newline() - + _("With higher security requirements, you should change the password.")); - } - else - { - proposal = HTML::Para(_("Creating default CA and certificate.") - + HTML::Newline()); - } - string passwordString = (string) (CaMgm::prop_passwordChanged ? _("[manually set]") : _("[root password]")); - proposal = proposal+ HTML::List( [ _("CA Name: ") + CaMgm::prop_CAName, - _("Common Name: ") + CaMgm::prop_ca_commonName, - _("Server Name: ") + CaMgm::prop_server_commonName, - _("Country: ") + CaMgm::prop_country, - _("Password: ") + passwordString, - _("E-Mail: ") + CaMgm::prop_email - ] ); - if ( Users::GetRootPassword() == "" && size(CaMgm::prop_password) == 0) - { - ret = add( ret, "warning", _("Unable to retrieve the system root password. Set a CA password to continue.")); - ret = add( ret, "warning_level", `blocker ); - } - else if ( size(CaMgm::prop_password) < 4) - { - ret = add( ret, "warning", _("The root password is too short for use as the password for the certificates. + // new handling of force reset because of (#238754) + if (force_reset) + { + y2milestone("FORCE RESET"); + if (CaMgm::prop_settingsWritten) + { + if( !Popup::YesNo(_("CA Management") + "\n" + + _("Settings have already been written.") + "\n" + + _("Delete the old settings?"))) + { + ret = $[ "workflow_sequence" : `auto ]; + } + else + { + YaPI::CaManagement::DeleteCA ($[ "caName":CaMgm::currentCA, + "caPasswd":getPassword(CaMgm::currentCA), + "force": true]); + CaMgm::prop_settingsWritten = false; + } + } + else + { + CaMgm::prop_selection = `def; + CaMgm::prop_ca_commonName = "YaST Default CA (" + hostname + ")"; + CaMgm::prop_CAName = "YaST_Default_CA"; + CaMgm::prop_country = Timezone::GetCountryForTimezone(""); + CaMgm::prop_password = Users::GetRootPassword(); + CaMgm::prop_email = "postmaster@" + domain; + CaMgm::prop_server_commonName = longhostname; + } + } + else // NO FORCE RESET + { // Try to read default Root CA and ask if it should be reused or deleted + map defaultRootCA = nil; + defaultRootCA = (map) YaPI::CaManagement::ReadFile( $["inFile":"/var/lib/CAM/" + CaMgm::prop_CAName + "/cacert.pem", + "type":"parsed", + "datatype":"CERTIFICATE", + "inForm":"PEM" + ]); + CaMgm::prop_settingsWritten = defaultRootCA != nil ? true:false; + + + if (CaMgm::prop_settingsWritten) + { + if( !Popup::YesNo(_("CA Management") + "\n" + + _("Settings have already been written.") + "\n" + + _("Delete the old settings?"))) + { + // read the details directly from the server certificate + map defaultServerCert = (map) YaPI::CaManagement::ReadFile( $[ + "inFile":"/etc/ssl/servercerts/servercert.pem", + "type":"parsed", + "datatype":"CERTIFICATE", + "inForm":"PEM" ]); + + map defaultServerCertIssuer = defaultServerCert["ISSUER_HASH"]:$[]; + // CaMgm::prop_selection = `def; + CaMgm::prop_ca_commonName = ((list)defaultServerCertIssuer["CN"]:[])[0]:""; + CaMgm::prop_country = ((list)defaultServerCertIssuer["C"]:[])[0]:""; + CaMgm::prop_email = ((list)defaultServerCertIssuer["emailAddress"]:[])[0]:""; + CaMgm::prop_CAName = CaMgm::prop_CAName; + CaMgm::prop_password = Users::GetRootPassword(); + + + map defaultSCmap = defaultServerCert["DN_HASH"]:$[]; + + CaMgm::prop_server_commonName = ((list)defaultSCmap["CN"]:[])[0]:""; + + + ret = $[ "workflow_sequence" : `auto ]; + } + else + { // delete the default Root CA manually because the root PW may be different in a repeated run of second-Stage + SCR::Execute(.target.bash, sformat(" rm -rf /var/lib/CAM/%1 ", CaMgm::prop_CAName )); + CaMgm::prop_settingsWritten = false; + } + } + } + + if (!check_mail_address(CaMgm::prop_email)) + { + ret = add( ret, "warning", _("Invalid e-mail format.")); + ret = add( ret, "warning_level", `blocker ); + } + + if (CaMgm::prop_selection == `def) + { + + if ( Users::GetRootPassword() == "" && size(CaMgm::prop_password) == 0) + { + + UI::OpenDialog (`opt(`decorated ), + `HBox(`VSpacing(10), + `VBox ( + `Label("Unable to retrieve the system root password. Set a CA password to continue."), + `HSpacing(10), + `Password(`id(`pw1), _("&Password:"), ""), + `Password(`id(`pw2), _("Co&nfirm Password"), ""), + `HSpacing(10), + `HBox(`PushButton (`id(`cancel), `opt(`key_F9), Label::CancelButton()), + `HStretch(), + `PushButton (`id(`ok), `opt(`default, `key_F10), Label::OKButton()) + ) + ), + `VSpacing(10) + ) + ); + UI::SetFocus (`id(`ok)); + while (true) + { + any rt = UI::UserInput(); + if (rt == `ok) + { + string pw1 = (string) UI::QueryWidget(`id(`pw1), `Value); + string pw2 = (string) UI::QueryWidget(`id(`pw2), `Value); + if(pw1 != pw2) + { + Popup::Error( _("New passwords do not match.") ); + continue; + } + if ( size(pw1) < 4) + { + Popup::Error(_("The password is too short for use as the password for the certificates. Enter a valid password for the certificates or disable certificate creation. ")); - ret = add( ret, "warning_level", `blocker ); - } - } - else if (CaMgm::prop_selection == `none) - { - proposal = HTML::Para(_("Not creating a CA and certificate.")); - } - else if (CaMgm::prop_selection == `disk) - { - proposal = HTML::Para(_("Importing a CA and certificate from file")); - } - - ret = add (ret, "preformatted_proposal", proposal); - if ( ((list<string>) splitstring (CaMgm::prop_server_commonName, "."))[0]:"" == "linux") - { - ret = add (ret, "warning" , - _("Is the default hostname linux really unique? The certificate is only valid if the hostname is correct.")); - } + continue; + } + CaMgm::prop_password = pw1; + CaMgm::prop_passwordChanged = true; + break; + } + else if (rt == `cancel) + { + ret = add( ret, "warning", _("Unable to retrieve the system root password. Set a CA password to continue.")); + ret = add( ret, "warning_level", `blocker ); + break; + } + } + + UI::CloseDialog (); + } + + if (!CaMgm::prop_passwordChanged) + { + proposal = HTML::Para(_("Creating default CA and certificate.") + + HTML::Newline() + + _("With higher security requirements, you should change the password.")); + } + else + { + proposal = HTML::Para(_("Creating default CA and certificate.") + + HTML::Newline()); + } + + string passwordString = (string) (CaMgm::prop_passwordChanged ? _("[manually set]") : _("[root password]")); + proposal = proposal+ HTML::List( [ _("CA Name: ") + CaMgm::prop_CAName, + _("Common Name: ") + CaMgm::prop_ca_commonName, + _("Server Name: ") + CaMgm::prop_server_commonName, + _("Country: ") + CaMgm::prop_country, + _("Password: ") + passwordString, + _("E-Mail: ") + CaMgm::prop_email + ] ); + + + if ( size(CaMgm::prop_password) < 4) + { + ret = add( ret, "warning", _("The root password is too short for use as the password for the certificates. + Enter a valid password for the certificates or disable certificate creation. +")); + ret = add( ret, "warning_level", `blocker ); + } + } + else if (CaMgm::prop_selection == `none) + { + proposal = HTML::Para(_("Not creating a CA and certificate.")); + } + else if (CaMgm::prop_selection == `disk) + { + proposal = HTML::Para(_("Importing a CA and certificate from file")); + } + + ret = add (ret, "preformatted_proposal", proposal); + if ( ((list<string>) splitstring (CaMgm::prop_server_commonName, "."))[0]:"" == "linux") + { + ret = add (ret, "warning" , + _("Is the default hostname linux really unique? The certificate is only valid if the hostname is correct.")); + } } else if (func == "AskUser") { - any sequence = WFM::CallFunction ( "ca_select_proposal", [] ); - if (CaMgm::prop_settingsWritten) - { - if( !Popup::YesNo(_("CA Management") + "\n" + - _("Settings have already been written.") + "\n" + - _("Delete the old settings?"))) - { - ret = $[ "workflow_sequence" : `auto ]; - } - else - { - YaPI::CaManagement::DeleteCA ($[ "caName":CaMgm::currentCA, - "caPasswd":getPassword(CaMgm::currentCA), - "force": true]); - CaMgm::prop_settingsWritten = false; - } - } + any sequence = WFM::CallFunction ( "ca_select_proposal", [] ); + if (CaMgm::prop_settingsWritten) + { + if( !Popup::YesNo(_("CA Management") + "\n" + + _("Settings have already been written.") + "\n" + + _("Delete the old settings?"))) + { + ret = $[ "workflow_sequence" : `auto ]; + } + else + { + YaPI::CaManagement::DeleteCA ($["caName":CaMgm::currentCA, + "caPasswd":getPassword(CaMgm::currentCA), + "force": true]); + CaMgm::prop_settingsWritten = false; + } + } } else if (func == "Description") { - // richtext label - ret = $[ "rich_text_title" : _("CA Management"), - // menu title - "menu_title" : _("&CA Management"), - "id" : "ca_mgm", - ]; + // richtext label + ret = $[ "rich_text_title" : _("CA Management"), + // menu title + "menu_title" : _("&CA Management"), + "id" : "ca_mgm", + ]; } else if (func == "Write") { - boolean success = true; - - if (!CaMgm::prop_settingsWritten) - { - if (CaMgm::prop_selection == `def) - { - success = create_default_CA_certificate(); - } - else if (CaMgm::prop_selection == `disk) - { - success = importCertificateFromDisk (); - } - if( success ) { - CaMgm::prop_settingsWritten = true; - } - } - + boolean success = true; + + if (!CaMgm::prop_settingsWritten) + { + if (CaMgm::prop_selection == `def) + { + success = create_default_CA_certificate(); + } + else if (CaMgm::prop_selection == `disk) + { + success = importCertificateFromDisk (); + } + if( success ) + { + CaMgm::prop_settingsWritten = true; + } + } + ret = $[ "success" : success ]; } return ret; -- 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] r41625 - in /trunk/mail/src: MailServer.ycp mail-advanced.ycp mail-server_dialogs.ycp mail-server_ldap-setup.ycp mail.ycp
by varkoly＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: varkoly Date: Mon Oct 29 17:49:55 2007 New Revision: 41625 URL: http://svn.opensuse.org/viewcvs/yast?rev=41625&view=rev Log: #335524 Advanced Mail Transfer Agent cannot access LDAP server Modified: trunk/mail/src/MailServer.ycp trunk/mail/src/mail-advanced.ycp trunk/mail/src/mail-server_dialogs.ycp trunk/mail/src/mail-server_ldap-setup.ycp trunk/mail/src/mail.ycp Modified: trunk/mail/src/MailServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServer.ycp?rev=4162… ============================================================================== --- trunk/mail/src/MailServer.ycp (original) +++ trunk/mail/src/MailServer.ycp Mon Oct 29 17:49:55 2007 @@ -216,7 +216,7 @@ if(! is_main_domain ) { y2milestone("no main mail domain"); - LDAPSettings["bind_pw"] = MailServer::AdminPassword; + LDAPSettings["bind_pw"] = AdminPassword; SCR::Execute (.ldap.bind,LDAPSettings); integer counter = 0; map lastDomain = $[]; Modified: trunk/mail/src/mail-advanced.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-advanced.ycp?rev=4… ============================================================================== --- trunk/mail/src/mail-advanced.ycp (original) +++ trunk/mail/src/mail-advanced.ycp Mon Oct 29 17:49:55 2007 @@ -36,13 +36,14 @@ * @param options map of options from command line * @return boolean true on success */ -boolean SetupMailServer(map<string,string> options) +boolean SetupMailServer() { any ret = SetupSequence(); return true; } -map cmdline_description = $[ +map cmdline_description = +$[ "id" : "mail-server", /* Command line help text for the mail-server module */ "help" : _("Configuration of mail server"), @@ -85,6 +86,10 @@ { ret = MailServerAutoSequence(); } +else if(setup) +{ + ret = SetupSequence(); +} else { ret = CommandLine::Run(cmdline_description); Modified: trunk/mail/src/mail-server_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_dialogs.ycp… ============================================================================== --- trunk/mail/src/mail-server_dialogs.ycp (original) +++ trunk/mail/src/mail-server_dialogs.ycp Mon Oct 29 17:49:55 2007 @@ -32,6 +32,7 @@ */ define any CheckLDAPDialog () { + y2milestone("--Start CheckLDAPDialog ---"); boolean ca_mgm = false; boolean conf_ldap_server = false; boolean setup_ldap_server = false; @@ -44,6 +45,7 @@ { //No LDAP-Client configuration setup_ldap_server = true; ca_mgm = true; + conf_ldap_server = true; comment = _("Your computer is not configured as LDAP-client.") + " " + _("We suggest to setup a local LDAP-server for the mail server.") + " " + _("To secure your system we suggest to create certificates for the LDAP and Mail Server.") + " "; @@ -52,14 +54,14 @@ { //The computer is configured as LDAP-Client if( LDAPSettings["ldap_server"]:"" == "127.0.0.1" ) { // The LDAP-Server is local - comment = _("Your computer is configured as LDAP-client and the LDAP-Server is local.") + " " + + comment = _("Your computer is configured as LDAP-client and the LDAP-Server is local.") + " " + _("We suggest to adapt the LDAP-server configuration for the mail server.") + " " + _("For this reason you have to know the password of the LDAP-administrator account:") + " " + "" + LDAPSettings["bind_dn"]:"" + ". "; } else { // The LDAP-Server is not local - comment = _("Your computer is configured as LDAP-client and the LDAP-Server is not local.") + " " + + comment = _("Your computer is configured as LDAP-client and the LDAP-Server is not local.") + " " + _("We suggest to configure the LDAP-server for the mail server.") + " " + _("For this reason you have to know the password of the LDAP-administrator account:") + " " + "" + LDAPSettings["bind_dn"]:"" + ". " + @@ -108,12 +110,30 @@ Ldap::LDAPInit(); LDAPSettings = (map <string, any>) Ldap::Export(); } - string adminpw = Ldap::LDAPAskAndBind(false); - if( adminpw != nil ) + MailServer::AdminPassword = Ldap::LDAPAskAndBind(false); + if( MailServer::AdminPassword != nil ) { - YaPI::MailServer::ResetMailServer(adminpw,LDAPSettings); + block<boolean> abort = ``{ + if (UI::PollInput () == `abort && + // popup text + Popup::YesNo (_("Really abort the writing process?"))) + return true; + return false; + }; + + //tell Ldap module to create the default objects: + LDAPSettings [ "create_ldap" ] = true; + Ldap::Import(LDAPSettings); + //write the settings: + Ldap::Write(abort); + //create default mail-server configuration + YaPI::MailServer::ResetMailServer(MailServer::AdminPassword,LDAPSettings); + return `next; + } + else + { + return `abort; } - return `ok; } /** @@ -124,6 +144,7 @@ define any AuthorizingDialog () { + y2milestone("--Start AuthorizingDialog ---"); Ldap::Read(); map LDAPSettings = Ldap::Export(); if(LDAPSettings["bind_dn"]:"" == "" ) @@ -140,6 +161,7 @@ } Ldap::Read(); } + Ldap::LDAPInit(); integer size1 = (integer)SCR::Read(.target.size, "/etc/ssl/servercerts/servercert.pem"); integer size2 = (integer)SCR::Read(.target.size, "/etc/ssl/servercerts/serverkey.pem"); @@ -152,11 +174,16 @@ MailServer::CertExist = true; } - return Ldap::LDAPAskAndBind(false); - + MailServer::AdminPassword = Ldap::LDAPAskAndBind(false); + if( MailServer::AdminPassword == nil ) + { + return `abort; + } + return `next; } -list<map> GenerateTree(list<map> Tree, string parent, list<list> input) { +list<map> GenerateTree(list<map> Tree, string parent, list<list> input) +{ foreach(list i, input, ``{ string title = i[0]:""; @@ -170,7 +197,9 @@ return Tree; } -term GlobalSettingsDialog() { +term GlobalSettingsDialog() +{ + y2milestone("--Start GlobalSettingsDialog ---"); boolean limit = ((string)MailServer::GlobalSettings["MaximumMailSize"]:"0" != "0"); boolean is_DNS = ((string)MailServer::GlobalSettings["SendingMail","Type"]:"" == "DNS"); boolean is_NONE = ((string)MailServer::GlobalSettings["SendingMail","Type"]:"" == "NONE"); @@ -302,7 +331,8 @@ return content; } -list<term> MakeSelectedList(list<string> items, string value ) { +list<term> MakeSelectedList(list<string> items, string value ) +{ list<term> SelectedList = []; foreach(string i, items, ``{ if( i == value ) { @@ -314,7 +344,9 @@ return SelectedList; } -void ShowMailTransport(string CID, string ACTION) { +void ShowMailTransport(string CID, string ACTION) +{ + y2milestone("--Start ShowMailTransport ---"); list<map<string,string> > Transports = (list<map<string,string> >) MailServer::MailTransports["Transports"]:[]; map<string,string> TLSSites = (map<string,string>) MailServer::MailTransports["TLSSites"]:$[]; map<string,list> SASLAccounts = (map<string,list>) MailServer::MailTransports["SASLAccounts"]:$[]; @@ -549,7 +581,9 @@ return; } -term MailTransportsDialog() { +term MailTransportsDialog() +{ + y2milestone("--Start MailTransportsDialog ---"); list<map<string,string> > Transports = (list<map<string,string> >) MailServer::MailTransports["Transports"]:[]; map<string,string> TLSSites = (map<string,string>) MailServer::MailTransports["TLSSites"]:$[]; list Transport_items = []; @@ -595,7 +629,9 @@ return content; } -term MailPreventionDialog(string CID, string CIDRBL) { +term MailPreventionDialog(string CID, string CIDRBL) +{ + y2milestone("--Start MailTransportsDialog ---"); list<term> AccessItems= []; list<term> RBLItems = []; string BasicProtection = (string)MailServer::MailPrevention["BasicProtection"]:""; @@ -678,7 +714,8 @@ return content; } -string RBLAdd () { +string RBLAdd () +{ UI::OpenDialog(`opt(`decorated ), `Frame(_("Add New RBL Server"), `VBox( `TextEntry(`id(`server), "", ""), @@ -703,7 +740,8 @@ return server; } -map AccessAdd () { +map AccessAdd () +{ UI::OpenDialog(`opt(`decorated ), `Frame(_("Add New Sender Restriction"), `VBox( `TextEntry(`id(`NewSender), _("Sender Address"), ""), @@ -737,7 +775,9 @@ return SenderRestriction; } -term MailRelayingDialog() { +term MailRelayingDialog() +{ + y2milestone("--Start MailRelayingDialog ---"); // boolean UserRestriction = ((string)MailServer::MailRelaying["UserRestriction"]:"0" == "1"); boolean RequireSASL = ((string)MailServer::MailRelaying["RequireSASL"]:"0" == "1"); boolean SMTPDTLSnone = ((string)MailServer::MailRelaying["SMTPDTLSMode"]:"none" == "none"); @@ -795,7 +835,9 @@ return content; } -term MailLocalDeliveryDialog() { +term MailLocalDeliveryDialog() +{ + y2milestone("--Start MailLocalDeliveryDialog ---"); boolean TypeCYRUS = ((string)MailServer::MailLocalDelivery["Type"]:"" == "cyrus"); boolean TypePROCMAIL = ((string)MailServer::MailLocalDelivery["Type"]:"" == "procmail"); boolean TypeLOCAL = ((string)MailServer::MailLocalDelivery["Type"]:"" == "local"); @@ -933,7 +975,9 @@ return content; } -term FetchingMailDialog() { +term FetchingMailDialog() +{ + y2milestone("--Start FetchingMailDialog ---"); list<term> table_items = []; integer IID = 0; list<map<string,string> > entries = (list<map<string,string> >) MailServer::FetchingMail["Items"]:[]; @@ -1017,7 +1061,9 @@ return content; } -map FetchmailAddItem(){ +map FetchmailAddItem() +{ + y2milestone("--Start FetchmailAddItem ---"); UI::OpenDialog(`opt(`decorated ), `Frame(_("Add New Fetchmail Job"), `VBox( `TextEntry(`id(`server), _("Server Address"), ""), @@ -1070,7 +1116,9 @@ } -term MailLocalDomainsDialog(string CID) { +term MailLocalDomainsDialog(string CID) +{ + y2milestone("--Start MailLocalDomainsDialog ---"); list<term> Domains = []; boolean NoLocalDelivery = ((string)MailServer::MailLocalDelivery["Type"]:"" == "none"); if(NoLocalDelivery) { @@ -1122,8 +1170,9 @@ return content; } -void ShowMailLocalDomain(string CID, string ACTION) { - +void ShowMailLocalDomain(string CID, string ACTION) +{ + y2milestone("--Start ShowMailLocalDomain ---"); string Name = ""; string Type = "local"; boolean Masquerading = true; @@ -1198,6 +1247,7 @@ boolean CheckMainDomain() { + y2milestone("--Start CheckMainDomain ---"); integer maindomain = 0; integer domains = 0; @@ -1226,7 +1276,7 @@ any ComplexDialog() { - + y2milestone("--Start ComplexDialog ---"); Wizard::CreateTreeDialog(); list<map> Tree = GenerateTree([], "", MailServer::ModulesTreeContent) ; Wizard::CreateTree(Tree, _("Mail Server Configuration")); Modified: trunk/mail/src/mail-server_ldap-setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_ldap-setup.… ============================================================================== --- trunk/mail/src/mail-server_ldap-setup.ycp (original) +++ trunk/mail/src/mail-server_ldap-setup.ycp Mon Oct 29 17:49:55 2007 @@ -33,7 +33,7 @@ y2milestone("--- mail-server-ldap-setup ---"); // First we check if all requested modules are installed - if( !Package::Installed ( "ldap-server" ) ) + if( !Package::Installed ( "yast2-ldap-server" ) ) { l_to_install = add( l_to_install, "yast2-ldap-server" ); to_install = to_install + "yast2-ldap-server\n"; @@ -75,18 +75,5 @@ { WFM::CallFunction("ldap",[]); } - Ldap::Read(); - Ldap::LDAPInit(); - map<string, any> LDAPSettings = (map<string, any>)Ldap::Export(); - string adminpw = Ldap::LDAPAskAndBind(false); - MailServerLDAP::ConfigureLDAPServer(LDAPSettings); - if( adminpw != nil ) - { - YaPI::MailServer::ResetMailServer(adminpw,LDAPSettings); - } - else - { - return false; - } return true; } Modified: trunk/mail/src/mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.ycp?rev=41625&r1=4… ============================================================================== --- trunk/mail/src/mail.ycp (original) +++ trunk/mail/src/mail.ycp Mon Oct 29 17:49:55 2007 @@ -139,7 +139,6 @@ Popup::Error(_("You have to select a configuration type")); continue; } - SCR::Write (.sysconfig.mail.CONFIG_TYPE, sret); y2milestone ("Mail configuration type %1", sret); break; } @@ -205,7 +204,10 @@ { ret = WFM::CallFunction("mail-standard",args); } - + if( ret != nil && ret != `cancel && ret != `abort ) + { + SCR::Write (.sysconfig.mail.CONFIG_TYPE, conf_type); + } } define boolean Setup (map<string, string> options) ``{ -- 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] r41624 - /trunk/printer/testsuite/tests/storePrinter.out
by mzugec＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: mzugec Date: Mon Oct 29 16:33:04 2007 New Revision: 41624 URL: http://svn.opensuse.org/viewcvs/yast?rev=41624&view=rev Log: fixed testsuite Modified: trunk/printer/testsuite/tests/storePrinter.out Modified: trunk/printer/testsuite/tests/storePrinter.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/testsuite/tests/storePri… ============================================================================== --- trunk/printer/testsuite/tests/storePrinter.out (original) +++ trunk/printer/testsuite/tests/storePrinter.out Mon Oct 29 16:33:04 2007 @@ -6,8 +6,8 @@ Dump [$["changed":true, "database":"foomatic", "name":"zzz", "ppd_info":$["filter":"foomatic-rip"], "uri":"lpd://unknown.suse.de/lp_rem", "valid":true]] Dump zzz Return nil -Dump [$["changed":true, "database":"foomatic", "name":"zzz", "ppd_info":$["filter":"foomatic-rip"], "uri":"lpd://unknown.suse.de/lp_rem", "valid":true], $["changed":true, "database":"foomatic", "name":"lp", "ppd_info":$["filter":"foomatic-rip"], "uri":"filtering://localhost/zzz", "valid":false]] +Dump [$["changed":true, "database":"foomatic", "name":"zzz", "ppd_info":$["filter":"foomatic-rip"], "uri":"lpd://unknown.suse.de/lp_rem", "valid":true]] Dump lp Return nil -Dump [$["changed":true, "database":"foomatic", "name":"zzz", "ppd_info":$["filter":"foomatic-rip"], "uri":"lpd://known.suse.de/lp", "valid":true], $["changed":true, "database":"foomatic", "name":"lp", "ppd_info":$["filter":"foomatic-rip"], "uri":"filtering://localhost/zzz", "valid":false]] +Dump [$["changed":true, "database":"foomatic", "name":"zzz", "ppd_info":$["filter":"foomatic-rip"], "uri":"lpd://known.suse.de/lp", "valid":true]] Dump zzz -- 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] r41623 - /tags/stable-2_16_2/ca-management/
by mcalmer＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: mcalmer Date: Mon Oct 29 16:19:17 2007 New Revision: 41623 URL: http://svn.opensuse.org/viewcvs/yast?rev=41623&view=rev Log: Created tag stable-2_16_2 for ca-management Added: tags/stable-2_16_2/ca-management/ - copied from r41622, trunk/ca-management/ -- 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] r41622 - in /trunk/ca-management: VERSION package/yast2-ca-management.changes
by mcalmer＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: mcalmer Date: Mon Oct 29 16:19:10 2007 New Revision: 41622 URL: http://svn.opensuse.org/viewcvs/yast?rev=41622&view=rev Log: version 2.16.2 Modified: trunk/ca-management/VERSION trunk/ca-management/package/yast2-ca-management.changes Modified: trunk/ca-management/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/VERSION?rev=41622&… ============================================================================== --- trunk/ca-management/VERSION (original) +++ trunk/ca-management/VERSION Mon Oct 29 16:19:10 2007 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/package/yast2-ca-m… ============================================================================== --- trunk/ca-management/package/yast2-ca-management.changes (original) +++ trunk/ca-management/package/yast2-ca-management.changes Mon Oct 29 16:19:10 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 29 16:12:36 CET 2007 - mc(a)suse.de + +- version 2.16.2 +- support cloning for autoyast + +------------------------------------------------------------------- Fri Oct 12 17:58:47 CEST 2007 - mc(a)suse.de - add email for subject_alt_name in special cases -- 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] r41621 - /tags/stable-2_16_1/printer/
by mzugec＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: mzugec Date: Mon Oct 29 16:14:10 2007 New Revision: 41621 URL: http://svn.opensuse.org/viewcvs/yast?rev=41621&view=rev Log: Created tag stable-2_16_1 for printer Added: tags/stable-2_16_1/printer/ - copied from r41620, trunk/printer/ -- 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] r41620 - in /trunk/printer: VERSION package/yast2-printer.changes src/common/dialogs.ycp src/cups/dialogs-cups.ycp src/modules/Printer.ycp
by mzugec＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: mzugec Date: Mon Oct 29 16:14:03 2007 New Revision: 41620 URL: http://svn.opensuse.org/viewcvs/yast?rev=41620&view=rev Log: "unknown" queue appears in the installation - (#308107) use [Accept] instead of [Finish] during installation - (#308102) Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/common/dialogs.ycp trunk/printer/src/cups/dialogs-cups.ycp trunk/printer/src/modules/Printer.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=41620&r1=416… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Mon Oct 29 16:14:03 2007 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Mon Oct 29 16:14:03 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 29 12:35:30 CET 2007 - mzugec(a)suse.cz + +- "unknown" queue appears in the installation - (#308107) +- use [Accept] instead of [Finish] during installation - (#308102) +- 2.16.1 + +------------------------------------------------------------------- Wed Oct 3 10:08:42 CEST 2007 - mvidner(a)suse.cz - Do not try to package COPYRIGHT.english, it is gone from Modified: trunk/printer/src/common/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/dialogs.ycp?r… ============================================================================== --- trunk/printer/src/common/dialogs.ycp (original) +++ trunk/printer/src/common/dialogs.ycp Mon Oct 29 16:14:03 2007 @@ -2301,7 +2301,8 @@ ]); SetHWDialogData (); - Wizard::SetNextButton(`next, _("Finish")); + if (Stage::normal()) Wizard::SetNextButton(`next, Label::FinishButton()); + else Wizard::SetNextButton(`next, Label::AcceptButton()); WizardHW::SetSelectedItem (Printer::runAutoprobedListDialog__current); Modified: trunk/printer/src/cups/dialogs-cups.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/cups/dialogs-cups.yc… ============================================================================== --- trunk/printer/src/cups/dialogs-cups.ycp (original) +++ trunk/printer/src/cups/dialogs-cups.ycp Mon Oct 29 16:14:03 2007 @@ -103,7 +103,6 @@ CWMFirewallInterfaces::OpenFirewallStore (firewall_widget, "", event); } - return (symbol)ret; } Modified: trunk/printer/src/modules/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/modules/Printer.ycp?… ============================================================================== --- trunk/printer/src/modules/Printer.ycp (original) +++ trunk/printer/src/modules/Printer.ycp Mon Oct 29 16:14:03 2007 @@ -728,8 +728,10 @@ if (-1 == index) { + if (printer["valid"]:false == true){ printcap = add (printcap, printer); index = size (printcap) - 1; + } } 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] r41619 - /trunk/ca-management/src/ca_mgm_auto.ycp
by mcalmer＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: mcalmer Date: Mon Oct 29 16:12:21 2007 New Revision: 41619 URL: http://svn.opensuse.org/viewcvs/yast?rev=41619&view=rev Log: implement Read for autoyast to support cloning Modified: trunk/ca-management/src/ca_mgm_auto.ycp Modified: trunk/ca-management/src/ca_mgm_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/ca_mgm_auto.yc… ============================================================================== --- trunk/ca-management/src/ca_mgm_auto.ycp (original) +++ trunk/ca-management/src/ca_mgm_auto.ycp Mon Oct 29 16:12:21 2007 @@ -167,7 +167,6 @@ UI::ChangeWidget (`id (`id_organisationUnit), `Enabled, false); UI::ChangeWidget (`id (`id_locality), `Enabled, false); UI::ChangeWidget (`id (`id_state), `Enabled, false); - UI::ChangeWidget (`id (`rootPassword), `Enabled, false); UI::ChangeWidget (`id (`pw1), `Enabled, false); UI::ChangeWidget (`id (`pw2), `Enabled, false); UI::ChangeWidget (`id (`localServerName), `Enabled, false); @@ -188,23 +187,14 @@ UI::ChangeWidget (`id (`id_organisationUnit), `Enabled, true); UI::ChangeWidget (`id (`id_locality), `Enabled, true); UI::ChangeWidget (`id (`id_state), `Enabled, true); - UI::ChangeWidget (`id (`rootPassword), `Enabled, true); UI::ChangeWidget (`id (`localServerName), `Enabled, true); UI::ChangeWidget (`id (`pathCert), `Enabled, false); UI::ChangeWidget (`id(`browseCert), `Enabled, false); UI::ChangeWidget (`id (`pw3), `Enabled, false); UI::ChangeWidget (`id (`pw4), `Enabled, false); - if ((boolean) UI::QueryWidget(`id(`rootPassword), `Value)) - { - UI::ChangeWidget (`id (`pw1), `Enabled, false); - UI::ChangeWidget (`id (`pw2), `Enabled, false); - } - else - { UI::ChangeWidget (`id (`pw1), `Enabled, true); UI::ChangeWidget (`id (`pw2), `Enabled, true); - } if ((boolean) UI::QueryWidget(`id(`localServerName), `Value)) { @@ -235,8 +225,7 @@ remove (CaMgm::autoYaSTSettings, "certificate"); boolean notImport = (boolean) (UI::QueryWidget(`id(`rb), `CurrentButton) == `notImport); - if (notImport - && !((boolean) UI::QueryWidget(`id(`rootPassword), `Value))) + if (notImport) { confirmPassword = (string) UI::QueryWidget(`id(`pw2), `Value); if ((string) UI::QueryWidget(`id(`pw1), `Value) != confirmPassword) @@ -637,7 +626,73 @@ return success; } +/** + * Read ca-management defaults + * @return true on success + */ +boolean Read() { + + map servercert = nil; + servercert = (map) YaPI::CaManagement::ReadFile( $["inFile":"/etc/ssl/servercerts/servercert.pem", + "type":"parsed", + "datatype":"CERTIFICATE", + "inForm":"PEM"]); + + boolean found = servercert != nil?true:false; + + string hostname = "linux"; + string domain = "site"; + map retmap = (map) SCR::Execute (.target.bash_output, + "/bin/hostname -s", + $[] ); + if (retmap["exit"]:1 == 0) + { + hostname = strip(retmap["stdout"]:"linux"); + } + + retmap = (map) SCR::Execute (.target.bash_output, + "/bin/hostname --domain", + $[] ); + + if (retmap["exit"]:1 == 0) + { + domain = strip(retmap["stdout"]:"site"); + } + + if(found) + { + map serverCertDN = servercert["DN_HASH"]:$[]; + map serverCertIssuer = servercert["ISSUER_HASH"]:$[]; + + + CaMgm::autoYaSTSettings["takeLocalServerName"] = false; + CaMgm::autoYaSTSettings["password"] = "ENTER PASSWORD HERE"; + CaMgm::autoYaSTSettings["server_commonName"] = ((list)serverCertDN["CN"]:[])[0]:(hostname + "." + domain); + CaMgm::autoYaSTSettings["CAName"] = "YaST_Default_CA"; + CaMgm::autoYaSTSettings["ca_commonName"] = ((list)serverCertIssuer["CN"]:[])[0]:("YaST Default CA " + "(" + domain + ")"); + CaMgm::autoYaSTSettings["server_email"] = ((list)serverCertDN["emailAddress"]:[])[0]:("postmaster@" + domain); + CaMgm::autoYaSTSettings["country"] = ((list)serverCertDN["C"]:[])[0]:"US"; + CaMgm::autoYaSTSettings["organisation"] = ((list)serverCertDN["O"]:[])[0]:""; + CaMgm::autoYaSTSettings["organisationUnit"] = ((list)serverCertDN["OU"]:[])[0]:""; + CaMgm::autoYaSTSettings["locality"] = ((list)serverCertDN["L"]:[])[0]:""; + CaMgm::autoYaSTSettings["state"] = ((list)serverCertDN["ST"]:[])[0]:""; + } + else + { + CaMgm::autoYaSTSettings["takeLocalServerName"] = true; + CaMgm::autoYaSTSettings["password"] = "ENTER PASSWORD HERE"; + CaMgm::autoYaSTSettings["CAName"] = "YaST_Default_CA"; + CaMgm::autoYaSTSettings["ca_commonName"] = "YaST Default CA " + "(" + domain + ")"; + CaMgm::autoYaSTSettings["server_email"] = "postmaster@" + domain; + CaMgm::autoYaSTSettings["country"] = Timezone::GetCountryForTimezone(""); + CaMgm::autoYaSTSettings["organisation"] = ""; + CaMgm::autoYaSTSettings["organisationUnit"] = ""; + CaMgm::autoYaSTSettings["locality"] = ""; + CaMgm::autoYaSTSettings["state"] = ""; + } + return true; +} //--------------------------------------------------------------------------- // MAIN @@ -694,6 +749,13 @@ ret = Write(); Progress::on(); } +/* Read settings */ +else if (func == "Read") { + import "Progress"; + Progress::off(); + ret = Read(); + Progress::on(); +} else if (func == "GetModified") { ret = CaMgm::autoYaSTModified; } -- 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] r41618 - /tags/stable-2_16_1/add-on-creator/
by jsuchome＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: jsuchome Date: Mon Oct 29 15:19:39 2007 New Revision: 41618 URL: http://svn.opensuse.org/viewcvs/yast?rev=41618&view=rev Log: Created tag stable-2_16_1 for add-on-creator Added: tags/stable-2_16_1/add-on-creator/ - copied from r41617, trunk/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] r41617 - in /trunk/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp src/complex.ycp
by jsuchome＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: jsuchome Date: Mon Oct 29 15:19:22 2007 New Revision: 41617 URL: http://svn.opensuse.org/viewcvs/yast?rev=41617&view=rev Log: - gpg needs --batch parameter to run non-interactively (#336680) - ask for reentering password when gpg fails (#297168) - 2.16.1 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp trunk/add-on-creator/src/complex.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=41617… ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Mon Oct 29 15:19:22 2007 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add… ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Mon Oct 29 15:19:22 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 29 15:04:37 CET 2007 - jsuchome(a)suse.cz + +- gpg needs --batch parameter to run non-interactively (#336680) +- ask for reentering password when gpg fails (#297168) +- 2.16.1 + +------------------------------------------------------------------- Mon Oct 1 11:23:59 CEST 2007 - jsuchome(a)suse.cz - create patterns with correct key ordering (#328816) Modified: trunk/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.… ============================================================================== --- trunk/add-on-creator/src/AddOnCreator.ycp (original) +++ trunk/add-on-creator/src/AddOnCreator.ycp Mon Oct 29 15:19:22 2007 @@ -38,6 +38,7 @@ import "Arch"; import "Directory"; import "FileUtils"; +import "Label"; import "Mode"; import "Package"; import "PackageSystem"; @@ -1843,6 +1844,55 @@ } /** + * Report the error with failed gpg and ask for possible new + * entering of pw + * @string error message from gpg + */ +string AskForPassphrase (string error) { + + string pw = nil; + UI::OpenDialog (`opt(`decorated), `HBox (`HSpacing (0.5), + `VBox ( + `HSpacing (70), + // error label + `Label (_("Signing of the product failed.")), + error == "" ? `VSpacing (0) : `RichText (mergestring (splitstring ( + String::EscapeTags (error),"\n")," ")), + `HBox ( + `CheckBox (`id (`again), `opt (`notify), + // checkbox label + _("Try again with different passphrase")), + `Password (`id (`pw1), "") + ), + `PushButton (`id(`ok),`opt(`key_F10), Label::OKButton()), + `VSpacing (0.5) + ), `HSpacing (0.5)) + ); + UI::ChangeWidget (`id (`pw1), `Enabled, false); + + any ret = `cancel; + repeat + { + ret = UI::UserInput (); + if (ret == `again) + { + boolean enabled = (boolean)UI::QueryWidget(`id(`pw1), `Enabled); + UI::ChangeWidget (`id (`pw1), `Enabled, !enabled); + } + if (ret == `ok) + { + if (UI::QueryWidget (`id(`pw1), `Enabled) == true) + { + pw = (string) UI::QueryWidget (`id(`pw1), `Value); + } + } + } until (ret == `ok || ret == `cancel); + + UI::CloseDialog (); + return pw; +} + +/** * Sign the add-on */ global boolean SignAddOn (string base_path, string key) { @@ -1882,6 +1932,36 @@ deletechars (out["stdout"]:"", "\n"), base_path); SCR::Execute (.target.bash, command, $["LANG" : "C"]); }); + while (true) + { + // sign the content file + SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", + base_path)); + out = (map) SCR::Execute (.target.bash_output, sformat("gpg --batch --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", + local_key, base_path, pw_path) + ); + if (out["exit"]:0 != 0) + { + if (Mode::commandline ()) + Report::Error (out["stderr"]:""); + else + { + passphrase = AskForPassphrase (out["stderr"]:""); + if (passphrase != nil) + { + SCR::Write (.target.string, pw_path, passphrase); + continue; + } + } + SCR::Execute (.target.remove, pw_path); + return false; + } + else break; + } + + SCR::Execute (.target.bash, + sformat("gpg --export -a %1 > '%2/content.key'",local_key, base_path)); + // sign the packages if (resign_packages) { @@ -1901,24 +1981,6 @@ SCR::Execute (.target.bash, sformat ("rm %1", expect)); } - // sign the content file - SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", base_path)); - out = (map) SCR::Execute (.target.bash_output, sformat(" - gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", - local_key, base_path, pw_path) - ); - if (out["exit"]:0 != 0) - { - if (Mode::commandline ()) - Report::Error (out["stderr"]:""); - else - // error message - Popup::ErrorDetails (_("Signing of the product failed."), out["stderr"]:""); - return false; - } - - SCR::Execute (.target.bash, - sformat("gpg --export -a %1 > '%2/content.key'",local_key, base_path)); // sign products file string products_path = full_media_paths[0]:"" + "/products"; @@ -1926,7 +1988,7 @@ { SCR::Execute (.target.bash, sformat ("rm -f '%1.asc'", products_path)); SCR::Execute (.target.bash, - sformat("gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2' < %3", + sformat("gpg --batch --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2' < %3", local_key, products_path, pw_path)); SCR::Execute (.target.bash, sformat("gpg --export -a %1 > '%2.key'", local_key,products_path)); @@ -1999,6 +2061,8 @@ _("Copy the packages"), // Progress stage _("Create MD5 sums"), + // Progress stage + _("Sign resulting product"), ]; list<string> steps = [ // Progress step @@ -2011,6 +2075,8 @@ _("Copying the packages..."), // Progress step _("Creating MD5 sums..."), + // Progress stage + _("Signing resulting product..."), ]; if (iso) @@ -2100,6 +2166,8 @@ CreateMD5SUMS (base_output_path); } + Progress::NextStage(); + if (!SignAddOn (base_output_path, gpg_key)) return false; Modified: trunk/add-on-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/complex.ycp?r… ============================================================================== --- trunk/add-on-creator/src/complex.ycp (original) +++ trunk/add-on-creator/src/complex.ycp Mon Oct 29 15:19:22 2007 @@ -778,8 +778,13 @@ table_type == "content" ? entry["key"]:"" : entry["label"]:""); any value = entry["value"]:nil; - if (table_type == "content" && value == nil) - value = ""; + if (value == nil) + { + if (table_type == "content") + value = ""; + if (type == "package-list") + value = []; + } term cont = `TextEntry (`id (`main), label, sformat("%1", value)); symbol w_id = `main; -- 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] r41616 - /branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/include/autopart.ycp
by ug＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: ug Date: Mon Oct 29 15:18:04 2007 New Revision: 41616 URL: http://svn.opensuse.org/viewcvs/yast?rev=41616&view=rev Log: evms path fixed Modified: branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/include/autopart.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/include/autopart.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/autoin… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/include/autopart.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/include/autopart.ycp Mon Oct 29 15:18:04 2007 @@ -809,7 +809,8 @@ p["used_fs"] = `unknown; p["fsid"] = Partitions::fsid_lvm; p["format"] = false; - string lvm = (solution["partitions",pindex,"evms_group"]:true)?("lvm2"):("lvm"); +// string lvm = (solution["partitions",pindex,"evms_group"]:true)?("lvm2"):("lvm"); + string lvm = "lvm2"; p["evms_group"] = "evms/"+lvm+"/"+solution["partitions",pindex,"evms_group"]:""; p["mount"] = ""; p["fstype"] = "EVMS"; -- 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] r41615 - /tags/branch-SLE-10-SP2-2_13_20/sound/
by lslezak＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: lslezak Date: Mon Oct 29 14:45:17 2007 New Revision: 41615 URL: http://svn.opensuse.org/viewcvs/yast?rev=41615&view=rev Log: Created tag branch-SLE-10-SP2-2_13_20 for sound Added: tags/branch-SLE-10-SP2-2_13_20/sound/ - copied from r41614, branches/SuSE-SLE-10-SP2-Branch/sound/ -- 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] r41614 - /tags/branch-SLE-10-SP2-2_13_20/
by lslezak＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: lslezak Date: Mon Oct 29 14:45:16 2007 New Revision: 41614 URL: http://svn.opensuse.org/viewcvs/yast?rev=41614&view=rev Log: Created tag branch-SLE-10-SP2-2_13_20 Added: tags/branch-SLE-10-SP2-2_13_20/ -- 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] r41613 - in /branches/SuSE-SLE-10-SP2-Branch/sound: VERSION package/yast2-sound.changes sound/config/sound.rnc sound/src/sound.desktop
by lslezak＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: lslezak Date: Mon Oct 29 14:45:09 2007 New Revision: 41613 URL: http://svn.opensuse.org/viewcvs/yast?rev=41613&view=rev Log: - fixed RNC schema for validating AutoYaST profile (#253614) - 2.13.20 Modified: branches/SuSE-SLE-10-SP2-Branch/sound/VERSION branches/SuSE-SLE-10-SP2-Branch/sound/package/yast2-sound.changes branches/SuSE-SLE-10-SP2-Branch/sound/sound/config/sound.rnc branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/sound.desktop Modified: branches/SuSE-SLE-10-SP2-Branch/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/sound/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/sound/VERSION Mon Oct 29 14:45:09 2007 @@ -1 +1 @@ -2.13.19 +2.13.20 Modified: branches/SuSE-SLE-10-SP2-Branch/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/sound/package/yast2-sound.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/sound/package/yast2-sound.changes Mon Oct 29 14:45:09 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 29 13:58:43 CET 2007 - lslezak(a)suse.cz + +- fixed RNC schema for validating AutoYaST profile (#253614) +- 2.13.20 + +------------------------------------------------------------------- Mon Oct 22 15:08:32 CEST 2007 - lslezak(a)suse.cz - Initialize "Speaker" and "Beep" channels (needed on Lenovo Modified: branches/SuSE-SLE-10-SP2-Branch/sound/sound/config/sound.rnc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/sound/sound/config/sound.rnc (original) +++ branches/SuSE-SLE-10-SP2-Branch/sound/sound/config/sound.rnc Mon Oct 29 14:45:09 2007 @@ -4,7 +4,19 @@ LOAD_ALSA_SEQ = element LOAD_ALSA_SEQ { text } module_conf = - element module_conf { snd_alias? & model? & snd_module? & snd_options? & unique_key? } + element module_conf { + element alias { text }? & + element model { text }? & + element module { text }? & + element options { Anything* }? & + element unique_key { text }? & + element bus { text }? & + element device_id { INTEGER }? & + element hwcfg { text }? & + element sub_device_id { INTEGER }? & + element sub_vendor_id { INTEGER }? & + element vendor_id { INTEGER }? + } modules_conf = element modules_conf { module_conf* @@ -13,9 +25,6 @@ element new { text } -snd_options = element options { - Anything* -} rc_vars = element rc_vars { LOAD_ALSA_SEQ* } snd_enable = element snd_enable { text } @@ -46,6 +55,3 @@ index = element index { text } isapnp = element isapnp { text } joystick = element joystick { text } -snd_module = element module { text } -snd_alias = element alias { text } -model = element model { text } Modified: branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/sound.desktop URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/sound.desktop (original) +++ branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/sound.desktop Mon Oct 29 14:45:09 2007 @@ -15,6 +15,7 @@ X-SuSE-YaST-Geometry= X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstClonable=true +X-SuSE-YaST-AutoInstSchema=sound.rnc Icon=yast-sound Exec=/sbin/yast2 sound -- 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] r41612 - in /branches/SuSE-SLE-10-SP2-Branch/sound: VERSION package/yast2-sound.changes sound/src/Sound.ycp sound/src/volume.ycp
by lslezak＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: lslezak Date: Mon Oct 29 14:44:11 2007 New Revision: 41612 URL: http://svn.opensuse.org/viewcvs/yast?rev=41612&view=rev Log: - Initialize "Speaker" and "Beep" channels (needed on Lenovo Thinkpad R61) (#309247) - 2.13.19 Modified: branches/SuSE-SLE-10-SP2-Branch/sound/VERSION branches/SuSE-SLE-10-SP2-Branch/sound/package/yast2-sound.changes branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/Sound.ycp branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/volume.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/sound/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/sound/VERSION Mon Oct 29 14:44:11 2007 @@ -1 +1 @@ -2.13.18 +2.13.19 Modified: branches/SuSE-SLE-10-SP2-Branch/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/sound/package/yast2-sound.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/sound/package/yast2-sound.changes Mon Oct 29 14:44:11 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 22 15:08:32 CEST 2007 - lslezak(a)suse.cz + +- Initialize "Speaker" and "Beep" channels (needed on Lenovo + Thinkpad R61) (#309247) +- 2.13.19 + +------------------------------------------------------------------- Fri Jan 12 13:24:37 CET 2007 - lslezak(a)suse.cz - updated the sound card database (snd-intel-hda PCI IDs) Modified: branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/Sound.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/Sound.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/Sound.ycp Mon Oct 29 14:44:11 2007 @@ -1190,7 +1190,7 @@ */ global define void InitMixer(integer c_id, string modname) ``{ y2milestone("InitMixer: %1, %2", c_id, modname); - map devs = db_modules[modname, "mixer"]:$["Master":70, "PCM":70, "CD":70, "Synth":70, "Front":70, "Headphone":70, "Master Mono":70 ]; + map devs = db_modules[modname, "mixer"]:$["Master":70, "PCM":70, "CD":70, "Synth":70, "Front":70, "Headphone":70, "Master Mono":70, "Speaker":70, "Beep":70 ]; y2milestone("Mixer devices: %1", devs); // now let's merge settings from volume_settings list Modified: branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/volume.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/volume.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/volume.ycp Mon Oct 29 14:44:11 2007 @@ -131,6 +131,10 @@ setVolume ("Master Mono", card_id, vol); // some systems use Front (#72971) setVolume ("Front", card_id, vol); + // Lenovo Thinkpad R61 (#309247) + setVolume ("Speaker", card_id, vol); + // Lenovo Thinkpad R61 (#309247) + setVolume ("Beep", card_id, vol); symbol ui = nil; do @@ -144,6 +148,8 @@ setVolume ("Headphone", card_id, vol); setVolume ("Master Mono", card_id, vol); setVolume ("Front", card_id, vol); + setVolume ("Speaker", card_id, vol); + setVolume ("Beep", card_id, vol); } else if (ui == `test) { @@ -364,6 +370,14 @@ { setVolume ("Master Mono", card_id, Sound::default_volume); } + if (haskey (devs, "Speaker")) + { + setVolume ("Speaker", card_id, Sound::default_volume); + } + if (haskey (devs, "Beep")) + { + setVolume ("Beep", card_id, Sound::default_volume); + } if (Sound::conf_joystick == true && Sound::use_ui) { -- 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] r41611 - in /branches/tmp/sh/mod-ui: core/libyui/src/ qt/src/
by sh-sh-sh＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: sh-sh-sh Date: Mon Oct 29 14:30:10 2007 New Revision: 41611 URL: http://svn.opensuse.org/viewcvs/yast?rev=41611&view=rev Log: Moved opaque 'data' void pointer from YTreeItem / YTableItem to YItem base class Modified: branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog branches/tmp/sh/mod-ui/core/libyui/src/YItem.h branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.cc branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.h branches/tmp/sh/mod-ui/core/libyui/src/YTreeItem.cc branches/tmp/sh/mod-ui/core/libyui/src/YTreeItem.h branches/tmp/sh/mod-ui/qt/src/QY2ListView.cc branches/tmp/sh/mod-ui/qt/src/QY2ListView.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog Mon Oct 29 14:30:10 2007 @@ -380,7 +380,7 @@ - Added YMenuEvent( YMenuEntry * ) constructor - Derived classes can use YMenuItem::index() as a unique ID - or use YMenuItem::data() and YMenuItem::setData() to store + or use YMenuItem::data() and YMenuItem::setData() to store a custom pointer to some other class. Look at YQMenuButton for a sample implementation. @@ -392,3 +392,10 @@ - Constructor now gets YTableHeader object - no more setHeader() and setAlignment functions - get rid of them - use columns(), header(), alignment() in the constructor to set up columns + + +2007-10-29 14:30 sh(a)suse.de + +* Moved opaque 'data' void pointer from YTreeItem / YTableItem + to YItem base class + Modified: branches/tmp/sh/mod-ui/core/libyui/src/YItem.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YItem.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YItem.h Mon Oct 29 14:30:10 2007 @@ -46,6 +46,7 @@ : _label( label ) , _selected( selected ) , _index( -1 ) + , _data( 0 ) {} /** @@ -56,6 +57,7 @@ , _iconName( iconName ) , _selected( selected ) , _index( -1 ) + , _data( 0 ) {} /** @@ -111,6 +113,21 @@ **/ int index() const { return _index; } + /** + * Set the opaque data pointer for application use. + * + * Applications can use this to store the pointer to a counterpart of this + * tree item. It is the application's responsibility to watch for dangling + * pointers and possibliy deleting the data. All this class ever does with + * this pointer is to store it. + **/ + void setData( void * newData ) { _data = newData; } + + /** + * Return the opaque data pointer. + **/ + void * data() const { return _data; } + // // Children management stubs. // @@ -161,6 +178,7 @@ string _iconName; bool _selected; int _index; + void * _data; /** * Static children collection that is always empty so the children Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.cc Mon Oct 29 14:30:10 2007 @@ -22,9 +22,8 @@ YTableItem::YTableItem() : YItem( "" ) - , _data( 0 ) { - + // NOP } @@ -39,7 +38,6 @@ const string & label_8, const string & label_9 ) : YItem( "" ) - , _data( 0 ) { vector<string> labels; labels.reserve(10); // slight optimization Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.h Mon Oct 29 14:30:10 2007 @@ -159,21 +159,6 @@ bool hasIconName( int index ) const; /** - * Set the opaque data pointer for application use. - * - * Applications can use this to store the pointer to a counterpart of this - * tree item. It is the application's responsibility to watch for dangling - * pointers and possibliy deleting the data. All this class ever does with - * this pointer is to store it. - **/ - void setData( void * newData ) { _data = newData; } - - /** - * Return the opaque data pointer. - **/ - void * data() const { return _data; } - - /** * Just for debugging. **/ string label() const { return label(0); } @@ -194,8 +179,7 @@ // Data members // - YTableCellCollection _cells; - void * _data; + YTableCellCollection _cells; }; Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTreeItem.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTreeItem.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTreeItem.cc Mon Oct 29 14:30:10 2007 @@ -24,7 +24,6 @@ : YItem( label ) , _parent( 0 ) , _isOpen( isOpen ) - , _data( 0 ) { } @@ -35,7 +34,6 @@ : YItem( label, iconName ) , _parent( 0 ) , _isOpen( isOpen ) - , _data( 0 ) { } @@ -46,7 +44,6 @@ : YItem( label ) , _parent( parent ) , _isOpen( isOpen ) - , _data( 0 ) { if ( parent ) parent->addChild( this ); @@ -60,7 +57,6 @@ : YItem( label, iconName ) , _parent( parent ) , _isOpen( isOpen ) - , _data( 0 ) { if ( parent ) parent->addChild( this ); Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTreeItem.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTreeItem.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTreeItem.h Mon Oct 29 14:30:10 2007 @@ -119,27 +119,11 @@ **/ YTreeItem * parent() const { return _parent; } - /** - * Set the opaque data pointer for application use. - * - * Applications can use this to store the pointer to a counterpart of this - * tree item. It is the application's responsibility to watch for dangling - * pointers and possibliy deleting the data. All this class ever does with - * this pointer is to store it. - **/ - void setData( void * newData ) { _data = newData; } - - /** - * Return the opaque data pointer. - **/ - void * data() const { return _data; } - private: YTreeItem * _parent; YItemCollection _children; bool _isOpen; - void * _data; }; Modified: branches/tmp/sh/mod-ui/qt/src/QY2ListView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/QY2ListV… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/QY2ListView.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/QY2ListView.cc Mon Oct 29 14:30:10 2007 @@ -311,7 +311,7 @@ } -bool +void QY2ListView::setSortByInsertionSequence( bool sortByInsertionSequence ) { _sortByInsertionSequence = sortByInsertionSequence; Modified: branches/tmp/sh/mod-ui/qt/src/QY2ListView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/QY2ListV… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/QY2ListView.h (original) +++ branches/tmp/sh/mod-ui/qt/src/QY2ListView.h Mon Oct 29 14:30:10 2007 @@ -138,7 +138,7 @@ * Enforce sorting by item insertion order (true) or let user change * sorting by clicking on a column header (false). **/ - virtual bool setSortByInsertionSequence( bool sortByInsertionSequence ); + virtual void setSortByInsertionSequence( bool sortByInsertionSequence ); /** * Returns the next free serial number for items that want to be ordered in -- 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] r41610 - /trunk/python-bindings/src/YCPTypes/Code.cc
by juhliarik＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: juhliarik Date: Mon Oct 29 12:53:08 2007 New Revision: 41610 URL: http://svn.opensuse.org/viewcvs/yast?rev=41610&view=rev Log: added new type for YCPCode Added: trunk/python-bindings/src/YCPTypes/Code.cc Added: trunk/python-bindings/src/YCPTypes/Code.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/Cod… ============================================================================== --- trunk/python-bindings/src/YCPTypes/Code.cc (added) +++ trunk/python-bindings/src/YCPTypes/Code.cc Mon Oct 29 12:53:08 2007 @@ -0,0 +1,174 @@ +#include "YCPTypesInternal.h" + +/** + * Deallocate Code object + */ +static void Code_dealloc(Code *self) +{ + //Py_XDECREF(self->name); + Py_XDECREF(self->value); + self->ob_type->tp_free((PyObject *)self); +} + +/** + * This function is called before Code_init. + * In this function is set only default values. + */ +PyObject *Code_new(PyTypeObject *type, PyObject *args, + PyObject *kwds) +{ + Code *self; + + self = (Code *)type->tp_alloc(type, 0); + if (self != NULL){ + self->value = Py_None; + if (self->value == NULL){ + Py_DECREF(self); + return NULL; + } + + self->hash = -1; + } + + return (PyObject *)self; +} + +/** + * Initialize Code object. + */ +int Code_init(Code *self, PyObject *args, PyObject *kwds) +{ + //PyObject *name = NULL; + PyObject *value = NULL; + PyObject *tmp; + // PyObject *pReturn; + int args_size; + + // check number of arguments + args_size = PyTuple_Size(args); + if (args_size < 1){ + PyErr_SetString(PyExc_TypeError, ": function takes exactly 1 argument (0 given)"); + return -1; + } + + // value: + value = PyTuple_GetItem(args, 0); + if (PyFunction_Check(value)){ + tmp = PyFunction_GetCode(self->value); + Py_INCREF(value); + self->value = value; + /* + printf("Code_init...\n"); + pReturn = PyObject_CallObject(self->value, NULL); + if (pReturn != NULL) + printf("Calling value: %d",PyInt_AsLong(pReturn)); + else + printf("pReturn == NULL");*/ + Py_XDECREF(tmp); + } else { + PyErr_SetString(PyExc_TypeError, ": argument 1 must be function"); + return -1; + } + /* + // value: + if (args_size > 1){ + value = PyTuple_GetSlice(args, 1, args_size); // return new reference + if (value != NULL){ + tmp = self->value; + self->value = value; + Py_XDECREF(tmp); + } + } + */ + return 0; +} + +/** + * Returns hash of Term object. + */ +static long Code_hash(Code *self) +{ + if (self->hash == -1){ + self->hash = PyObject_Hash(self->value); + } + return self->hash; +} + +/** + * Compare two Code objects. + * If obj1 or obj2 are not Code returns -1 (it means not equal) + */ +static int Code_cmp(PyObject *obj1, PyObject *obj2) +{ + // check if obj1 and obj2 are Terms + if (PyObject_IsInstance(obj1, (PyObject *)&CodeType) != 1 || + PyObject_IsInstance(obj2, (PyObject *)&CodeType) != 1) + return -1; + + if (PyObject_Compare(((Code *)obj1)->value, ((Code *)obj2)->value) == 0){ + return 0; + } + return 1; +} + + +static PyMethodDef Code_methods[] = { + {"isCode", (PyCFunction)YCPType_isCode, METH_NOARGS, "Return true if object is Code."}, + {"isSymbol", (PyCFunction)YCPType_isSymbol, METH_NOARGS, "Return true if object is Symbol."}, + {"isPath", (PyCFunction)YCPType_isPath, METH_NOARGS, "Return true if object is Path."}, + {"isTerm", (PyCFunction)YCPType_isTerm, METH_NOARGS, "Return true if object is Term."}, + {NULL} /* Sentinel */ +}; + +/** + * List of accessible members of Term. + */ +static PyMemberDef Code_members[] = { + // value is accessible only for read + {"value", T_OBJECT_EX, offsetof(Code, value), READONLY, "Value of the Code"}, + {NULL} /* Sentinel */ +}; + +PyTypeObject CodeType = { + PyObject_HEAD_INIT(NULL) + 0, /*ob_size*/ + "ycp.Code", /*tp_name*/ + sizeof(Code), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + (destructor)Code_dealloc,/*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + (cmpfunc)Code_cmp, /*tp_compare*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + (hashfunc)Code_hash,/*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT, /*tp_flags*/ + "YCP Code", /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + Code_methods, /* tp_methods */ + Code_members, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)Code_init,/* tp_init */ + 0, /* tp_alloc */ + Code_new, /* tp_new */ +}; + + -- 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] r41609 - in /trunk/python-bindings/src: ./ YCPTypes/
by juhliarik＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: juhliarik Date: Mon Oct 29 12:48:10 2007 New Revision: 41609 URL: http://svn.opensuse.org/viewcvs/yast?rev=41609&view=rev Log: added temporrary solution for calling python function via references Modified: trunk/python-bindings/src/Makefile.am trunk/python-bindings/src/YCP.cc trunk/python-bindings/src/YCPTypes.cc trunk/python-bindings/src/YCPTypes.h trunk/python-bindings/src/YCPTypes/Path.cc trunk/python-bindings/src/YCPTypes/Symbol.cc trunk/python-bindings/src/YCPTypes/Term.cc trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc trunk/python-bindings/src/YCPTypes/YCPTypesInternal.h trunk/python-bindings/src/YPython.cc trunk/python-bindings/src/YPython.h trunk/python-bindings/src/YPythonNamespace.cc Modified: trunk/python-bindings/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/Makefile.am?… ============================================================================== --- trunk/python-bindings/src/Makefile.am (original) +++ trunk/python-bindings/src/Makefile.am Mon Oct 29 12:48:10 2007 @@ -21,6 +21,7 @@ YCPTypes/YCPTypesInternal.cc YCPTypes/YCPTypesInternal.h \ YCPTypes/Path.cc \ YCPTypes/Symbol.cc \ + YCPTypes/Code.cc \ YCPTypes/Term.cc libYCPDeclarations_la_SOURCES = YCPDeclarations.cc YCPDeclarations.h @@ -29,7 +30,10 @@ libYCP_la_SOURCES = \ $(liby2lang_python_la_SOURCES) \ YCP.cc \ - PythonLogger.cc PythonLogger.h + PythonLogger.cc PythonLogger.h \ + YPythonNamespace.cc YPythonNamespace.h \ + YCPDeclarations.cc YCPDeclarations. + install-data-hook: Modified: trunk/python-bindings/src/YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCP.cc?rev=4… ============================================================================== --- trunk/python-bindings/src/YCP.cc (original) +++ trunk/python-bindings/src/YCP.cc Mon Oct 29 12:48:10 2007 @@ -14,6 +14,7 @@ #include <ycp/Import.h> #include <yui/YUIComponent.h> #include <wfm/Y2WFMComponent.h> +#include <ycp/Parser.h> #include <ycp/YCPMap.h> #include <ycp/YCPList.h> #include <ycp/YCPPath.h> @@ -24,6 +25,7 @@ #include "YPython.h" #include "PythonLogger.h" + #include "YCPTypes.h" /** @@ -41,6 +43,8 @@ PyObject * SCR_Run (const char *scr_command, PyObject *args); +PyObject * Py_ycp_code(PyObject *args); + void Py_y2logger(PyObject *args); void init_wfm (); @@ -125,6 +129,13 @@ return Py_None; } +static PyObject * ycp_code (PyObject *self, PyObject *args) { + + Py_ycp_code(args); + return Py_None; +} + + /** * This is needed for importing new module from ycp. */ @@ -143,6 +154,7 @@ {"SCR_Execute", ycp_scr_execute, METH_VARARGS, "SCR Execute function"}, {"SCR_Dir", ycp_scr_dir, METH_VARARGS, "SCR Dir function"}, {"y2logger", ycp_y2logger, METH_VARARGS, "Logging error, debug messages and milestones in python"}, + {"ycp_code", ycp_code, METH_VARARGS, "Convert Python function call to YCP Code"}, {NULL, NULL, 0, NULL} /* Sentinel */ }; @@ -194,7 +206,6 @@ PyObject *dict = PyModule_GetDict(Self); PyObject *code; - code = PyRun_String(func_y2internal, Py_single_input, dict, dict); Py_XDECREF(code); @@ -229,7 +240,7 @@ if (PyDict_Contains(dict, name_space) == 1) ret = true; - + Py_XDECREF(name_space); return ret; @@ -337,6 +348,41 @@ return PyBool_FromLong(1); } + +PyObject * Py_ycp_code(PyObject *args) { + + Parser *parser; + PyObject *temp; + string command; + YCodePtr c = 0; + + temp = PyTuple_GetItem(args, 0); + + if (PyString_Check(temp)) + command = PyString_AsString(temp); + else + command = ""; + cout << command << endl; + parser = new Parser(command.c_str()); + + //parser->setInput(command.c_str()); + //parser->setBuffered(); + c = parser->parse(); + + if (c) + c->evaluate(); + else + cout << "eee c nejde!" << endl; + + cout << c->toString() << endl; + + delete(parser); + + return Py_None; + +} + + PyObject * Import_YCPNameSpace (PyObject *args) { PyObject* pResult = PyBool_FromLong(0); @@ -621,11 +667,12 @@ if (pPythonValue) { ycpArg = ypython->PythonTypeToYCPType(pPythonValue); + /*XXX if (fun_type->parameterType(i-2)->matchvalue(ycpArg) != 0) { y2error ("Wrong type of argumment %d",i-2); return PyExc_TypeError; - } + }*/ bool ok = func_call->appendParameter (ycpArg); if (!ok) { y2error ("Problem with adding arguments of function %s", func_name); @@ -657,7 +704,7 @@ delete []func_name; pReturnValue = ypython->YCPTypeToPythonType(ycpRetValue); - + Py_INCREF(pReturnValue); return pReturnValue; } else { Modified: trunk/python-bindings/src/YCPTypes.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes.cc?… ============================================================================== --- trunk/python-bindings/src/YCPTypes.cc (original) +++ trunk/python-bindings/src/YCPTypes.cc Mon Oct 29 12:48:10 2007 @@ -10,13 +10,16 @@ return false; if (PyType_Ready(&TermType) < 0) return false; - + if (PyType_Ready(&CodeType) < 0) + return false; Py_INCREF(&SymbolType); PyModule_AddObject(module, "Symbol", (PyObject *)&SymbolType); Py_INCREF(&PathType); PyModule_AddObject(module, "Path", (PyObject *)&PathType); Py_INCREF(&TermType); PyModule_AddObject(module, "Term", (PyObject *)&TermType); + Py_INCREF(&CodeType); + PyModule_AddObject(module, "Code", (PyObject *)&CodeType); return true; } @@ -36,6 +39,9 @@ return PATH; if (isTerm(obj)) return TERM; + if (isCode(obj)) + return CODE; + return NOT_YCP_TYPE; } @@ -186,3 +192,61 @@ } /***** Term END *****/ +/***** Code *****/ +bool isCode(PyObject *obj) +{ + if (PyObject_IsInstance(obj, (PyObject *)&CodeType)) + return true; + return false; +} + +PyObject *Code_getValue(Code *obj) +{ + if (isCode((PyObject *)obj)){ + return obj->value; + } + return Py_None; +} + + +PyObject *Code_New(PyObject *value) +{ + PyObject *ret; + PyObject *args; + int size, i; + PyObject *tmp; + + if (!PyFunction_Check(value)){ + return Py_None; + } + + // create args variable + + args = PyTuple_New(1); + + if (PyTuple_SetItem(args, 0, value) != 0){ + Py_XDECREF(args); + Py_DECREF(value); + return Py_None; + } + + // create new object + ret = Code_new(&CodeType, Py_None, Py_None); + if (ret == NULL){ + Py_XDECREF(args); + return Py_None; + } + + // initialize object + if (Code_init((Code *)ret, args, Py_None) == -1){ + Py_XDECREF(args); + return Py_None; + } + + Py_XDECREF(args); + return ret; +} + + +/***** Term END *****/ + Modified: trunk/python-bindings/src/YCPTypes.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes.h?r… ============================================================================== --- trunk/python-bindings/src/YCPTypes.h (original) +++ trunk/python-bindings/src/YCPTypes.h Mon Oct 29 12:48:10 2007 @@ -69,9 +69,32 @@ PyObject *Term_New(PyObject *name, PyObject *list_value); PyObject *Term_NewString(const char *name, PyObject *list_value); +/** + * Code + * Code is composed from value (pointer to function call) + */ +typedef struct{ + PyObject_HEAD + PyObject *value; // pointer to function + long hash; +} Code; +extern PyTypeObject CodeType; + +bool isCode(PyObject *); + + +/** + * Returns list or None. + * Borrowed reference! + */ +PyObject *Code_getValue(Code *); + +PyObject *Code_New(PyObject *value); + + /** - * Initialize alll YCP types + * Initialize all YCP types */ bool initYCPTypes(PyObject *module); @@ -87,7 +110,7 @@ * ... * } */ -enum YCPType { NOT_YCP_TYPE, PATH, SYMBOL, TERM }; +enum YCPType { NOT_YCP_TYPE, PATH, SYMBOL, TERM, CODE }; YCPType getYCPType(PyObject *); #endif Modified: trunk/python-bindings/src/YCPTypes/Path.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/Pat… ============================================================================== --- trunk/python-bindings/src/YCPTypes/Path.cc (original) +++ trunk/python-bindings/src/YCPTypes/Path.cc Mon Oct 29 12:48:10 2007 @@ -79,6 +79,7 @@ static PyMethodDef Path_methods[] = { {"append", (PyCFunction)Path_append, METH_O, "Return new Path object with appended path given in argument."}, {"prepend", (PyCFunction)Path_prepend, METH_O, "Return new Path object with perpended path given in argument."}, + {"isCode", (PyCFunction)YCPType_isCode, METH_NOARGS, "Return true if object is Code."}, {"isSymbol", (PyCFunction)YCPType_isSymbol, METH_NOARGS, "Return true if object is Symbol."}, {"isPath", (PyCFunction)YCPType_isPath, METH_NOARGS, "Return true if object is Path."}, {"isTerm", (PyCFunction)YCPType_isTerm, METH_NOARGS, "Return true if object is Term."}, Modified: trunk/python-bindings/src/YCPTypes/Symbol.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/Sym… ============================================================================== --- trunk/python-bindings/src/YCPTypes/Symbol.cc (original) +++ trunk/python-bindings/src/YCPTypes/Symbol.cc Mon Oct 29 12:48:10 2007 @@ -37,6 +37,7 @@ static PyMethodDef Symbol_methods[] = { {"isSymbol", (PyCFunction)YCPType_isSymbol, METH_NOARGS, "Return true if object is Symbol."}, + {"isCode", (PyCFunction)YCPType_isCode, METH_NOARGS, "Return true if object is Code."}, {"isPath", (PyCFunction)YCPType_isPath, METH_NOARGS, "Return true if object is Path."}, {"isTerm", (PyCFunction)YCPType_isTerm, METH_NOARGS, "Return true if object is Term."}, {NULL} /* Sentinel */ Modified: trunk/python-bindings/src/YCPTypes/Term.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/Ter… ============================================================================== --- trunk/python-bindings/src/YCPTypes/Term.cc (original) +++ trunk/python-bindings/src/YCPTypes/Term.cc Mon Oct 29 12:48:10 2007 @@ -124,6 +124,7 @@ static PyMethodDef Term_methods[] = { {"len", (PyCFunction)Term_len, METH_NOARGS, "Return number of Terms\' parameters."}, + {"isCode", (PyCFunction)YCPType_isCode, METH_NOARGS, "Return true if object is Code."}, {"isSymbol", (PyCFunction)YCPType_isSymbol, METH_NOARGS, "Return true if object is Symbol."}, {"isPath", (PyCFunction)YCPType_isPath, METH_NOARGS, "Return true if object is Path."}, {"isTerm", (PyCFunction)YCPType_isTerm, METH_NOARGS, "Return true if object is Term."}, Modified: trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/YCP… ============================================================================== --- trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc (original) +++ trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc Mon Oct 29 12:48:10 2007 @@ -111,3 +111,12 @@ Py_RETURN_FALSE; } } + +PyObject *YCPType_isCode(PyObject *self, PyObject *) +{ + if (isCode(self)){ + Py_RETURN_TRUE; + }else{ + Py_RETURN_FALSE; + } +} Modified: trunk/python-bindings/src/YCPTypes/YCPTypesInternal.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/YCP… ============================================================================== --- trunk/python-bindings/src/YCPTypes/YCPTypesInternal.h (original) +++ trunk/python-bindings/src/YCPTypes/YCPTypesInternal.h Mon Oct 29 12:48:10 2007 @@ -40,6 +40,11 @@ int Term_init(Term *self, PyObject *args, PyObject *kwds); +PyObject *Code_new(PyTypeObject *type, PyObject *args, PyObject *kwds); +int Code_init(Code *self, PyObject *args, PyObject *kwds); + + +PyObject *YCPType_isCode(PyObject *self, PyObject *); PyObject *YCPType_isSymbol(PyObject *self, PyObject *); PyObject *YCPType_isPath(PyObject *self, PyObject *); PyObject *YCPType_isTerm(PyObject *self, PyObject *); Modified: trunk/python-bindings/src/YPython.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPython.cc?r… ============================================================================== --- trunk/python-bindings/src/YPython.cc (original) +++ trunk/python-bindings/src/YPython.cc Mon Oct 29 12:48:10 2007 @@ -31,7 +31,6 @@ #include <ycp/pathsearch.h> - #include <YPython.h> #include <ycp/YCPValue.h> #include <ycp/YCPBoolean.h> @@ -49,6 +48,8 @@ #include <ycp/YCPExternal.h> #include "YCPTypes.h" +#include "YPythonNamespace.h" + #include <iostream> #define DBG(str) \ std::cerr << __FILE__ << ": " << __LINE__ << ": " << str << std::endl; \ @@ -129,16 +130,28 @@ //delete last 3 chars from module name ".py" module_name.erase(module_name.size()-3); //delete ".py" //initialize python and set the path where are python modules + + cout << "Searching path for modules: " << Py_GetPath()<< endl; if (!Py_IsInitialized()) { + cout <<"path :" << path << endl; setenv("PYTHONPATH", path.c_str(), 1); + Py_Initialize(); YPython::_pMainDicts = PyDict_New(); } + setenv("PYTHONPATH", path.c_str(), 1); + cout <<"path :" << path << endl; + if (!YPython::_pMainDicts) + YPython::_pMainDicts = PyDict_New(); //create python string for name of module pModuleName = PyString_FromString(module_name.c_str()); //check if dictionary contain "dictionary" for module if ( PyDict_Contains(YPython::_pMainDicts, pModuleName) == 0) { + cout <<"loadModule name: " << module_name << endl; + //char * new_path = (char *) path.c_str(); + //PySys_SetPath(new_path); + cout << "Searching path for modules after init: " << Py_GetPath()<< endl; pMain = PyImport_ImportModule(module_name.c_str()); if (pMain == NULL){ y2error("Can't import module %s", module_name.c_str()); @@ -155,7 +168,9 @@ return YCPError("The module was not imported"); } else { - return YCPError("The module is imported"); + //return YCPError("The module is imported"); + y2error("The module is imported"); + return YCPVoid(); } @@ -252,6 +267,14 @@ if (PyString_Check(pythonValue)) return YCPString(PyString_AsString(pythonValue)); + //functions ->Reference + if (PyFunction_Check(pythonValue)) + return fromPythonFunToReference (pythonValue); + + //function + if (PyFunction_Check(pythonValue)) + return YCPByteblock((const unsigned char *)PyFunction_GetCode(pythonValue), (long) sizeof(PyFunction_GetCode(pythonValue))); + //list if (PyList_Check(pythonValue)) return fromPythonListToYCPList(pythonValue); @@ -264,6 +287,8 @@ if (PyDict_Check(pythonValue)) return fromPythonDictToYCPMap(pythonValue); + + // term, symbol, path switch (getYCPType(pythonValue)){ case SYMBOL: @@ -272,6 +297,9 @@ return YCPPath(Path_getValue((Path *)pythonValue)); case TERM: return fromPythonTermToYCPTerm(pythonValue); + case CODE: + return YCPCode(new YPythonCode(Code_getValue((Code *)pythonValue))); + case NOT_YCP_TYPE: return YCPNull(); } @@ -584,3 +612,119 @@ return Term_NewString(ycp_Term->asTerm()->name().c_str(), value); } + +/** + * Convert Python Function to YCPCode. + * + * @param pointer to python function + * @return YCPCode - Referecne + **/ + +YCPValue YPython::fromPythonFunToReference (PyObject* pyFun) { + + + FunctionTypePtr sym_tp = new FunctionType(Type::Any); + PyObject *fun_code = PyFunction_GetCode(pyFun); + char *fun_name = PyString_AsString(((PyCodeObject *) fun_code)->co_name); + + string file_path = PyString_AsString(((PyCodeObject *) fun_code)->co_filename); + //Y2Namespace* name_space = new Y2Namespace(); + + printf ("meno funckie %s\n", fun_name); + printf ("meno suboru %s\n", file_path.c_str()); + + //found last "/" in path + size_t found = file_path.find_last_of("/"); + //extract module name from path + string module_name = file_path.substr(found+1); + + file_path = YCPPathSearch::find (YCPPathSearch::Module, module_name); + + if (file_path.empty()) + file_path = YCPPathSearch::find (YCPPathSearch::Include, module_name); + + if (file_path.empty()) + file_path = YCPPathSearch::find (YCPPathSearch::Client, module_name); + + if (file_path.empty()) { + y2error("Finding file where is function %s failed", fun_name); + return YCPNull(); + } + + + + YPython::loadModule (file_path); + + + //found last "/" in path + found = file_path.find_last_of("/"); + //extract module name from path + + module_name = file_path.substr(found+1); + + //delete last 3 chars from module name ".py" + module_name.erase(module_name.size()-3); //delete ".py" + + //found last "/" in path + Y2Namespace *ns = new YPythonNamespace (module_name); + + + if (ns) { + TableEntry *sym_te = ns->table ()->find (fun_name); + if (sym_te == NULL) { + y2error ("No such symbol %s::%s", module_name.c_str(), fun_name); + return YCPNull(); + } + SymbolEntryPtr sym_entry = sym_te->sentry(); + cout << "entry" << sym_entry->toString()<< endl; + return YCPReference(sym_entry); + + } else { + y2error("Creating namespace for function %s failed", fun_name); + return YCPNull(); + + } + + return YCPNull(); +} + + + +YPythonCode::YPythonCode (PyObject *pFunc):YCode() { + m_kind = YCode::yeReference; + _pFunc = pFunc; +} + +YCPValue YPythonCode::evaluate(bool cse) { + + PyObject * pReturn; + YCPValue result = YCPVoid(); + + if (Py_IsInitialized()) { + pReturn = PyObject_CallObject(_pFunc, NULL); + //convert python value to YCPValue + if (pReturn) { + result = YPython::yPython()->PythonTypeToYCPType(pReturn); // create YCP value + } else { + y2error("pReturn == 0"); + } + } + return result; + +} + +YCode::ykind YPythonCode::kind() const { + + return m_kind; +} + +std::ostream & YPythonCode::toStream (std::ostream & str) const { + + return str; +} + +std::ostream & YPythonCode::toXml (std::ostream & str, int indent ) const { + + return str; + +} Modified: trunk/python-bindings/src/YPython.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPython.h?re… ============================================================================== --- trunk/python-bindings/src/YPython.h (original) +++ trunk/python-bindings/src/YPython.h Mon Oct 29 12:48:10 2007 @@ -22,9 +22,35 @@ #include <Python.h> #include <ycp/YCPList.h> +#include <ycp/YCPValue.h> #include <ycp/Type.h> +#include <ycp/YCPCode.h> +#include <ycp/YCode.h> + +class YPythonCode : public YCode +{ + +public: + YPythonCode (PyObject *pFunc); + + YCode::ykind kind() const; + + std::ostream & toStream (std::ostream & str) const; + + std::ostream & toXml (std::ostream & str, int indent ) const; + /** + * Evaluates the code. + */ + YCPValue evaluate (bool cse = false); + +private: + ykind m_kind; + PyObject *_pFunc; + +}; + class YPython { public: @@ -134,6 +160,8 @@ **/ PyObject* fromYCPTermToPythonTerm (YCPValue ycp_Term); + YCPValue fromPythonFunToReference (PyObject* pyFun); + protected: /** Modified: trunk/python-bindings/src/YPythonNamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPythonNames… ============================================================================== --- trunk/python-bindings/src/YPythonNamespace.cc (original) +++ trunk/python-bindings/src/YPythonNamespace.cc Mon Oct 29 12:48:10 2007 @@ -171,6 +171,7 @@ return; } + //keys from dictionary fun_names = PyDict_Keys(pMainDict); -- 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] r41608 - /tags/branch-Linux-10_3-2_15_10/product-creator/
by jsuchome＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: jsuchome Date: Mon Oct 29 12:26:21 2007 New Revision: 41608 URL: http://svn.opensuse.org/viewcvs/yast?rev=41608&view=rev Log: Created tag branch-Linux-10_3-2_15_10 for product-creator Added: tags/branch-Linux-10_3-2_15_10/product-creator/ - copied from r41607, branches/SuSE-Linux-10_3-Branch/product-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] r41607 - /tags/branch-Linux-10_3-2_15_10/
by jsuchome＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: jsuchome Date: Mon Oct 29 12:26:19 2007 New Revision: 41607 URL: http://svn.opensuse.org/viewcvs/yast?rev=41607&view=rev Log: Created tag branch-Linux-10_3-2_15_10 Added: tags/branch-Linux-10_3-2_15_10/ -- 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] r41606 - /tags/branch-Linux-10_3-2_15_23/add-on-creator/
by jsuchome＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: jsuchome Date: Mon Oct 29 12:26:19 2007 New Revision: 41606 URL: http://svn.opensuse.org/viewcvs/yast?rev=41606&view=rev Log: Created tag branch-Linux-10_3-2_15_23 for add-on-creator Added: tags/branch-Linux-10_3-2_15_23/add-on-creator/ - copied from r41605, branches/SuSE-Linux-10_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] r41605 - /tags/branch-Linux-10_3-2_15_23/
by jsuchome＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: jsuchome Date: Mon Oct 29 12:26:17 2007 New Revision: 41605 URL: http://svn.opensuse.org/viewcvs/yast?rev=41605&view=rev Log: Created tag branch-Linux-10_3-2_15_23 Added: tags/branch-Linux-10_3-2_15_23/ -- 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] r41604 - in /branches/SuSE-Linux-10_3-Branch/product-creator: VERSION package/yast2-product-creator.changes src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: jsuchome Date: Mon Oct 29 12:26:15 2007 New Revision: 41604 URL: http://svn.opensuse.org/viewcvs/yast?rev=41604&view=rev Log: - do not read the template name when going from main summary (#337444) - 2.15.10 Modified: branches/SuSE-Linux-10_3-Branch/product-creator/VERSION branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Linux-10_3-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-Linux-10_3-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/VERSION (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/VERSION Mon Oct 29 12:26:15 2007 @@ -1 +1 @@ -2.15.9 +2.15.10 Modified: branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes Mon Oct 29 12:26:15 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 26 12:52:54 CEST 2007 - jsuchome(a)suse.cz + +- do not read the template name when going from main summary (#337444) +- 2.15.10 + +------------------------------------------------------------------- Thu Oct 4 09:50:06 CEST 2007 - jsuchome(a)suse.cz - add a default user to the iso template (#328145) Modified: branches/SuSE-Linux-10_3-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/src/kiwi_dialogs.ycp Mon Oct 29 12:26:15 2007 @@ -776,12 +776,15 @@ map<string,any> read_config = Kiwi::ReadConfigXML (kiwi_configuration); if (!KiwiConfig["_imported"]:false) { - KiwiConfig = (map<string,any>) union (KiwiConfig, read_config); + KiwiConfig = (map<string,any>) union ( + // "type" had different meaning in ProductCreator::Config... + remove (KiwiConfig, "type"), read_config); // for new configuration, do not read all from the template y2milestone ("product-creator based configuration..."); foreach (string key, ["addons", "packages", "sources"], { KiwiConfig[key] = ProductCreator::Config[key]:[]; }); + KiwiConfig["name"] = ProductCreator::Config["name"]:""; } 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] r41603 - in /branches/SuSE-Linux-10_3-Branch/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 29 Oct '07

29 Oct '07

Author: jsuchome Date: Mon Oct 29 12:26:07 2007 New Revision: 41603 URL: http://svn.opensuse.org/viewcvs/yast?rev=41603&view=rev Log: - gpg needs --batch parameter to run non-interactively (#336680) - 2.15.23 Modified: branches/SuSE-Linux-10_3-Branch/add-on-creator/VERSION branches/SuSE-Linux-10_3-Branch/add-on-creator/package/yast2-add-on-creator.changes branches/SuSE-Linux-10_3-Branch/add-on-creator/src/AddOnCreator.ycp Modified: branches/SuSE-Linux-10_3-Branch/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/add-on… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/add-on-creator/VERSION (original) +++ branches/SuSE-Linux-10_3-Branch/add-on-creator/VERSION Mon Oct 29 12:26:07 2007 @@ -1 +1 @@ -2.15.22 +2.15.23 Modified: branches/SuSE-Linux-10_3-Branch/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/add-on… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/add-on-creator/package/yast2-add-on-creator.changes (original) +++ branches/SuSE-Linux-10_3-Branch/add-on-creator/package/yast2-add-on-creator.changes Mon Oct 29 12:26:07 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 25 13:57:19 CEST 2007 - jsuchome(a)suse.cz + +- gpg needs --batch parameter to run non-interactively (#336680) +- 2.15.23 + +------------------------------------------------------------------- Mon Oct 1 11:23:59 CEST 2007 - jsuchome(a)suse.cz - create patterns with correct key ordering (#328816) Modified: branches/SuSE-Linux-10_3-Branch/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/add-on… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/add-on-creator/src/AddOnCreator.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/add-on-creator/src/AddOnCreator.ycp Mon Oct 29 12:26:07 2007 @@ -1894,8 +1894,8 @@ // sign the content file SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", base_path)); - out = (map) SCR::Execute (.target.bash_output, sformat(" - gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", + + out = (map) SCR::Execute (.target.bash_output, sformat("gpg --batch --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", local_key, base_path, pw_path) ); if (out["exit"]:0 != 0) @@ -1917,7 +1917,7 @@ { SCR::Execute (.target.bash, sformat ("rm -f '%1.asc'", products_path)); SCR::Execute (.target.bash, - sformat("gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2' < %3", + sformat("gpg --batch --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2' < %3", local_key, products_path, pw_path)); SCR::Execute (.target.bash, sformat("gpg --export -a %1 > '%2.key'", local_key,products_path)); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0