December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <rest-service> jr-basemodel : add documentation to BaseModel (partial only)
by Josef Reidinger 11 Dec '09

11 Dec '09

ref: refs/heads/jr-basemodel commit 1cb47ff74e910a0509c235c6d296db42504912eb Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 11 18:15:22 2009 +0100 add documentation to BaseModel (partial only) --- webservice/lib/base_model/base.rb | 73 ++++++++++++++++++++++++++ webservice/lib/base_model/mass_assignment.rb | 36 +++++++++++++ 2 files changed, 109 insertions(+), 0 deletions(-) diff --git a/webservice/lib/base_model/base.rb b/webservice/lib/base_model/base.rb index eb72bcb..aec330f 100644 --- a/webservice/lib/base_model/base.rb +++ b/webservice/lib/base_model/base.rb @@ -1,40 +1,113 @@ module BaseModel + # == Base + # Shared ancestor for models that want to act similar as ActiveResource or ActiveRecord model. + # + # Inspired by ActiveModel from rails3.0 + # Supported features + # * Validation + # * Callbacks + # * Mass assignment + # * Serialization + # + # === Validation + # It is used validation from ActiveRecord. For details see ActiveRecord::Validations + # + # Not all validation is usable in all models. Basic supported ones is: + # * validates_presence_of + # * validates_format_of + # * validates_inclusion_of + # * validates_exclusion_of + # * validates_range_of + # * validates_lenght_of + # * validates_numberically_of + # * validates_each (general validation) + # * validates_numberically_of + # see ActiveRecord::Validations::ClassMethods documentation for arguments + # + # === Callbacks + # It is used to add hook to actions from ActiveRecord. For details see ActiveRecord::Callbacks + # Supported callbacks (all have before and after variant also): + # * around_create + # * around_destroy + # * around_save + # * around_update + # * around_validation + # * around_validation_on_create + # * around_validation_on_update + # * general around_filter + # see ActiveRecord::Callbacks documentation for arguments + # + # === Mass assignment + # see BaseModel::MassAssignment + # + # === Serialization + # Framework to support serialization. By default is support xml and json serialization (method to_xml and to_json) + # and deserialization (from_xml and from_json). + # + # TODO add example + class Base + # requirement for class which should be used in ActiveModel + # see http://www.engineyard.com/blog/2009/my-five-favorite-things-about-rails-3/ (paragraph 4) def to_model self end + # initialize attributes by hash in attr def initialize(attr={}) load(attr) end + # saves result + # if fails sets error + # see ActiveRecord::Base#save or ActiveResource::Base#save + # Do not overwritte it, overwrite instead create or update def save create_or_update end + # same as save but throws exception if error occur + # see save def save! create_or_update #TODO raise exception end + # identification if create new source or update already existing one + # by default return false ( always update ) def new_record? false #always update by default end + # Creates or updates source depending on result of new_record? + # Use method save unless you really know what you are doing. def create_or_update (new_record? ? create : update) != false end + # Creates new source. + # By default do nothing. + # Overwrite only if you overwrite also new_record? otherwise it is never call + # If problem occur returns false and must properly set Error structure see ActiveRecord::Error def create true end + # Updates source. + # By default do nothing. + # Overwrite it if model is not read-only + # If problem occur returns false and must properly set Error structure see ActiveRecord::Error def update true end + # destroys source. + # By default do nothing. + # Overwrite it if model is not read-only + # If problem occur returns false and must properly set Error structure see ActiveRecord::Error def destroy + true end #remove overwritten method_missing from activeRecord diff --git a/webservice/lib/base_model/mass_assignment.rb b/webservice/lib/base_model/mass_assignment.rb index b90ce0d..b342650 100644 --- a/webservice/lib/base_model/mass_assignment.rb +++ b/webservice/lib/base_model/mass_assignment.rb @@ -1,5 +1,28 @@ module BaseModel + # == Mass Assignment module + # Adds ability to load instance variables from hash + # It allow whitelisting and blacklisting variables which should not be + # overwritten. It respect common behavior in ActiveResource and ActiveRecord. + # For mass loading see ActiveResource::Base#load + # For whitelisting details see ActiveRecord::Base.attr_accessible + # For blacklisting details see ActiveRecord::Base.attr_protected + # + # Example: + # class C + # include BaseModel::MassAssignment + # + # attr_accessor :attr1, attr2, :internal + # + # attr_protected :internal + # + # def instantiate(attr={}) + # load attr + # end + # end module MassAssignment + # loads hash to instance variables, where keys is names of variables and + # hash value is variables values + # it has same behavior as ActiveResource::Base#load def load(attributes) attributes.each do |k,v| whitelist = self.class.accessible_attributes @@ -15,20 +38,33 @@ module BaseModel end module ClassMethods + + # Defines attributes which should be loaded by mass assignment. + # By default is used all attributes + # For disable using loading non-whitelisted attributes use + # without parameters + # param args is variable number of symbols which identify variables def attr_accessible ( *args ) @attr_accessible ||= [] @attr_accessible.concat args end + # Gets list of allowed attributes. If result is nil, then is allowed is + # all attributes which is not protected. def accessible_attributes @attr_accessible end + # Defines attributes which cannot be loaded by mass assignment. + # By default all attributes is not protected. + # Note only used if whitelist is not specified by attr_accessible + # param args is variable number of symbols which identify variables def attr_protected ( *args ) @attr_protected ||= [] @attr_protected.concat args end + # Gets list of protected attributes. If result is nil, then no attributes is protected. def protected_attributes @attr_protected end -- 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] <rest-service> master : add documentation to BaseModel (partial only)
by Josef Reidinger 11 Dec '09

11 Dec '09

ref: refs/heads/master commit 1cb47ff74e910a0509c235c6d296db42504912eb Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 11 18:15:22 2009 +0100 add documentation to BaseModel (partial only) --- webservice/lib/base_model/base.rb | 73 ++++++++++++++++++++++++++ webservice/lib/base_model/mass_assignment.rb | 36 +++++++++++++ 2 files changed, 109 insertions(+), 0 deletions(-) diff --git a/webservice/lib/base_model/base.rb b/webservice/lib/base_model/base.rb index eb72bcb..aec330f 100644 --- a/webservice/lib/base_model/base.rb +++ b/webservice/lib/base_model/base.rb @@ -1,40 +1,113 @@ module BaseModel + # == Base + # Shared ancestor for models that want to act similar as ActiveResource or ActiveRecord model. + # + # Inspired by ActiveModel from rails3.0 + # Supported features + # * Validation + # * Callbacks + # * Mass assignment + # * Serialization + # + # === Validation + # It is used validation from ActiveRecord. For details see ActiveRecord::Validations + # + # Not all validation is usable in all models. Basic supported ones is: + # * validates_presence_of + # * validates_format_of + # * validates_inclusion_of + # * validates_exclusion_of + # * validates_range_of + # * validates_lenght_of + # * validates_numberically_of + # * validates_each (general validation) + # * validates_numberically_of + # see ActiveRecord::Validations::ClassMethods documentation for arguments + # + # === Callbacks + # It is used to add hook to actions from ActiveRecord. For details see ActiveRecord::Callbacks + # Supported callbacks (all have before and after variant also): + # * around_create + # * around_destroy + # * around_save + # * around_update + # * around_validation + # * around_validation_on_create + # * around_validation_on_update + # * general around_filter + # see ActiveRecord::Callbacks documentation for arguments + # + # === Mass assignment + # see BaseModel::MassAssignment + # + # === Serialization + # Framework to support serialization. By default is support xml and json serialization (method to_xml and to_json) + # and deserialization (from_xml and from_json). + # + # TODO add example + class Base + # requirement for class which should be used in ActiveModel + # see http://www.engineyard.com/blog/2009/my-five-favorite-things-about-rails-3/ (paragraph 4) def to_model self end + # initialize attributes by hash in attr def initialize(attr={}) load(attr) end + # saves result + # if fails sets error + # see ActiveRecord::Base#save or ActiveResource::Base#save + # Do not overwritte it, overwrite instead create or update def save create_or_update end + # same as save but throws exception if error occur + # see save def save! create_or_update #TODO raise exception end + # identification if create new source or update already existing one + # by default return false ( always update ) def new_record? false #always update by default end + # Creates or updates source depending on result of new_record? + # Use method save unless you really know what you are doing. def create_or_update (new_record? ? create : update) != false end + # Creates new source. + # By default do nothing. + # Overwrite only if you overwrite also new_record? otherwise it is never call + # If problem occur returns false and must properly set Error structure see ActiveRecord::Error def create true end + # Updates source. + # By default do nothing. + # Overwrite it if model is not read-only + # If problem occur returns false and must properly set Error structure see ActiveRecord::Error def update true end + # destroys source. + # By default do nothing. + # Overwrite it if model is not read-only + # If problem occur returns false and must properly set Error structure see ActiveRecord::Error def destroy + true end #remove overwritten method_missing from activeRecord diff --git a/webservice/lib/base_model/mass_assignment.rb b/webservice/lib/base_model/mass_assignment.rb index b90ce0d..b342650 100644 --- a/webservice/lib/base_model/mass_assignment.rb +++ b/webservice/lib/base_model/mass_assignment.rb @@ -1,5 +1,28 @@ module BaseModel + # == Mass Assignment module + # Adds ability to load instance variables from hash + # It allow whitelisting and blacklisting variables which should not be + # overwritten. It respect common behavior in ActiveResource and ActiveRecord. + # For mass loading see ActiveResource::Base#load + # For whitelisting details see ActiveRecord::Base.attr_accessible + # For blacklisting details see ActiveRecord::Base.attr_protected + # + # Example: + # class C + # include BaseModel::MassAssignment + # + # attr_accessor :attr1, attr2, :internal + # + # attr_protected :internal + # + # def instantiate(attr={}) + # load attr + # end + # end module MassAssignment + # loads hash to instance variables, where keys is names of variables and + # hash value is variables values + # it has same behavior as ActiveResource::Base#load def load(attributes) attributes.each do |k,v| whitelist = self.class.accessible_attributes @@ -15,20 +38,33 @@ module BaseModel end module ClassMethods + + # Defines attributes which should be loaded by mass assignment. + # By default is used all attributes + # For disable using loading non-whitelisted attributes use + # without parameters + # param args is variable number of symbols which identify variables def attr_accessible ( *args ) @attr_accessible ||= [] @attr_accessible.concat args end + # Gets list of allowed attributes. If result is nil, then is allowed is + # all attributes which is not protected. def accessible_attributes @attr_accessible end + # Defines attributes which cannot be loaded by mass assignment. + # By default all attributes is not protected. + # Note only used if whitelist is not specified by attr_accessible + # param args is variable number of symbols which identify variables def attr_protected ( *args ) @attr_protected ||= [] @attr_protected.concat args end + # Gets list of protected attributes. If result is nil, then no attributes is protected. def protected_attributes @attr_protected end -- 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] r60084 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server: VERSION package/yast2-ldap-server.changes
by rhafer＠svn.opensuse.org 11 Dec '09

11 Dec '09

Author: rhafer Date: Fri Dec 11 17:11:28 2009 New Revision: 60084 URL: http://svn.opensuse.org/viewcvs/yast?rev=60084&view=rev Log: preparing 2.17.26 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION Fri Dec 11 17:11:28 2009 @@ -1 +1 @@ -2.17.25 +2.17.26 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Fri Dec 11 17:11:28 2009 @@ -1,6 +1,9 @@ ------------------------------------------------------------------- -Fri Dec 11 12:30:01 UTC 2009 - rhafer(a)novell.com +Fri Dec 11 14:57:50 UTC 2009 - rhafer(a)novell.com +- Version 2.17.26 +- Fixed the syncrepl client check. The LDAPSync Control was not + initialized correctly (bnc#563955) - make sure the syncrepl rid is unique accross the server, when setting up a new syncrepl client (bnc#561857) - fixed the Add Database Wizard workflow. It was not possible to -- 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] r60083 - in /branches/SuSE-Code-11-SP1-Branch/installation: package/yast2-installation.changes src/clients/inst_complex_welcome.ycp src/clients/inst_license.ycp yast2-installation.spec.in
by locilka＠svn.opensuse.org 11 Dec '09

11 Dec '09

Author: locilka Date: Fri Dec 11 17:07:32 2009 New Revision: 60083 URL: http://svn.opensuse.org/viewcvs/yast?rev=60083&view=rev Log: Adapted for new API to ProductLicense (FATE #306295) Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_license.ycp branches/SuSE-Code-11-SP1-Branch/installation/yast2-installation.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes Fri Dec 11 17:07:32 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Dec 11 16:48:58 CET 2009 - locilka(a)suse.cz + +- Adapted for new API to ProductLicense (FATE #306295). + +------------------------------------------------------------------- Wed Dec 9 16:44:34 CET 2009 - locilka(a)suse.cz - Package kde4-kdm has been renamed to kdm (SLES, SLED control Modified: branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp Fri Dec 11 17:07:32 2009 @@ -53,6 +53,8 @@ boolean text_mode = Language::GetTextMode (); + string license_ui_id = "base_license"; + /* ---------------------------------------------------------------------- * Build dialog * ----------------------------------------------------------------------*/ @@ -221,7 +223,7 @@ language = (string) UI::QueryWidget (`id (`language), `Value); keyboard = (string) UI::QueryWidget (`id (`keyboard), `Value); - if (ProductLicense::AcceptanceNeeded()) { + if (ProductLicense::AcceptanceNeeded (license_ui_id)) { license_acc = (boolean) UI::QueryWidget (`id (`license_agreement), `Value); } else { license_acc = true; @@ -295,7 +297,7 @@ return false; } - ProductLicense::ShowLicenseInInstallation (`base_license_rp); + ProductLicense::ShowLicenseInInstallation (`base_license_rp, Pkg::SourceGetCurrent(true)[0]:0); // bugzilla #206706 if (Mode::autoinst()) { @@ -303,7 +305,7 @@ } // If accepting the license is required, show the check-box - if (ProductLicense::AcceptanceNeeded()) { + if (ProductLicense::AcceptanceNeeded (license_ui_id)) { UI::ReplaceWidget (`license_checkbox_rp, license_agreement_checkbox); } @@ -331,7 +333,7 @@ if (ret == `next ) { // BNC #448598 // Check whether the license has been accepted only if required - if (ProductLicense::AcceptanceNeeded() && ! LicenseAccepted ()) + if (ProductLicense::AcceptanceNeeded (license_ui_id) && ! LicenseAccepted ()) continue; if (!Language::CheckIncompleteTranslation (language)) @@ -349,7 +351,7 @@ if (ret == `next) break; } else if (ret == `show_fulscreen_license) { UI::OpenDialog (AllLicensesDialog()); - ProductLicense::ShowFullScreenLicenseInInstallation (`full_screen_license_rp); + ProductLicense::ShowFullScreenLicenseInInstallation (`full_screen_license_rp, Pkg::SourceGetCurrent(true)[0]:0); UI::CloseDialog(); } } Modified: branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_license.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_license.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_license.ycp Fri Dec 11 17:07:32 2009 @@ -53,7 +53,7 @@ if (Stage::initial ()) { - ask_ret = ProductLicense::AskFirstStageLicenseAgreement (action); + ask_ret = ProductLicense::AskFirstStageLicenseAgreement (0, action); } else { @@ -81,7 +81,7 @@ directory = Directory::custom_workflow_dir + directory; // patterns are hardcoded - ask_ret = ProductLicense::AskInstalledLicenseAgreement (directory, [], action); + ask_ret = ProductLicense::AskInstalledLicenseAgreement (directory, [], action, "0"); } if (test_mode) Wizard::CloseDialog(); Modified: branches/SuSE-Code-11-SP1-Branch/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/yast2-installation.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/yast2-installation.spec.in Fri Dec 11 17:07:32 2009 @@ -37,8 +37,8 @@ # Pkg::SourceProvideDigestedFile() Conflicts: yast2-pkg-bindings < 2.17.25 -# BNC #449818: "description_id" in DefaultDesktop -Requires: yast2-packager >= 2.17.49 +# New API to ProductLicense module +Requires: yast2-packager >= 2.17.64 # Storage::GetCommitInfo() call in include/misc.ycp Requires: yast2-storage >= 2.17.47 -- 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] r60082 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_complex_welcome.ycp src/clients/inst_license.ycp yast2-installation.spec.in
by locilka＠svn.opensuse.org 11 Dec '09

11 Dec '09

Author: locilka Date: Fri Dec 11 17:07:21 2009 New Revision: 60082 URL: http://svn.opensuse.org/viewcvs/yast?rev=60082&view=rev Log: Adapted for new API to ProductLicense (FATE #306295) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_complex_welcome.ycp trunk/installation/src/clients/inst_license.ycp trunk/installation/yast2-installation.spec.in Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Dec 11 17:07:21 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Dec 11 16:48:58 CET 2009 - locilka(a)suse.cz + +- Adapted for new API to ProductLicense (FATE #306295). + +------------------------------------------------------------------- Wed Dec 9 16:44:34 CET 2009 - locilka(a)suse.cz - Package kde4-kdm has been renamed to kdm (SLES, SLED control Modified: trunk/installation/src/clients/inst_complex_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_co… ============================================================================== --- trunk/installation/src/clients/inst_complex_welcome.ycp (original) +++ trunk/installation/src/clients/inst_complex_welcome.ycp Fri Dec 11 17:07:21 2009 @@ -53,6 +53,8 @@ boolean text_mode = Language::GetTextMode (); + string license_ui_id = "base_license"; + /* ---------------------------------------------------------------------- * Build dialog * ----------------------------------------------------------------------*/ @@ -221,7 +223,7 @@ language = (string) UI::QueryWidget (`id (`language), `Value); keyboard = (string) UI::QueryWidget (`id (`keyboard), `Value); - if (ProductLicense::AcceptanceNeeded()) { + if (ProductLicense::AcceptanceNeeded (license_ui_id)) { license_acc = (boolean) UI::QueryWidget (`id (`license_agreement), `Value); } else { license_acc = true; @@ -295,7 +297,7 @@ return false; } - ProductLicense::ShowLicenseInInstallation (`base_license_rp); + ProductLicense::ShowLicenseInInstallation (`base_license_rp, Pkg::SourceGetCurrent(true)[0]:0); // bugzilla #206706 if (Mode::autoinst()) { @@ -303,7 +305,7 @@ } // If accepting the license is required, show the check-box - if (ProductLicense::AcceptanceNeeded()) { + if (ProductLicense::AcceptanceNeeded (license_ui_id)) { UI::ReplaceWidget (`license_checkbox_rp, license_agreement_checkbox); } @@ -331,7 +333,7 @@ if (ret == `next ) { // BNC #448598 // Check whether the license has been accepted only if required - if (ProductLicense::AcceptanceNeeded() && ! LicenseAccepted ()) + if (ProductLicense::AcceptanceNeeded (license_ui_id) && ! LicenseAccepted ()) continue; if (!Language::CheckIncompleteTranslation (language)) @@ -349,7 +351,7 @@ if (ret == `next) break; } else if (ret == `show_fulscreen_license) { UI::OpenDialog (AllLicensesDialog()); - ProductLicense::ShowFullScreenLicenseInInstallation (`full_screen_license_rp); + ProductLicense::ShowFullScreenLicenseInInstallation (`full_screen_license_rp, Pkg::SourceGetCurrent(true)[0]:0); UI::CloseDialog(); } } Modified: trunk/installation/src/clients/inst_license.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_li… ============================================================================== --- trunk/installation/src/clients/inst_license.ycp (original) +++ trunk/installation/src/clients/inst_license.ycp Fri Dec 11 17:07:21 2009 @@ -53,7 +53,7 @@ if (Stage::initial ()) { - ask_ret = ProductLicense::AskFirstStageLicenseAgreement (action); + ask_ret = ProductLicense::AskFirstStageLicenseAgreement (0, action); } else { @@ -81,7 +81,7 @@ directory = Directory::custom_workflow_dir + directory; // patterns are hardcoded - ask_ret = ProductLicense::AskInstalledLicenseAgreement (directory, [], action); + ask_ret = ProductLicense::AskInstalledLicenseAgreement (directory, [], action, "0"); } if (test_mode) Wizard::CloseDialog(); Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.… ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Fri Dec 11 17:07:21 2009 @@ -37,8 +37,8 @@ # Mouse-related scripts moved to yast2-mouse Conflicts: yast2-mouse < 2.18.0 -# BNC #449818: "description_id" in DefaultDesktop -Requires: yast2-packager >= 2.17.49 +# New API for ProductLicense +Requires: yast2-packager >= 2.19.2 # Storage::GetCommitInfos() call in include/misc.ycp Requires: yast2-storage >= 2.18.0 -- 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] r60081 - in /trunk/packager: package/yast2-packager.changes src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 11 Dec '09

11 Dec '09

Author: locilka Date: Fri Dec 11 16:52:03 2009 New Revision: 60081 URL: http://svn.opensuse.org/viewcvs/yast?rev=60081&view=rev Log: ProductLicense prepared for multi-license dialogs (FATE #306295). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/ProductLicense.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Dec 11 16:52:03 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Dec 11 16:48:58 CET 2009 - locilka(a)suse.cz + +- ProductLicense prepared for multi-license dialogs (FATE #306295). + +------------------------------------------------------------------- Tue Dec 8 13:54:49 CET 2009 - kmachalkova(a)suse.cz - 'Search' button is the one activated by pressing Enter in webpin Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLice… ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Fri Dec 11 16:52:03 2009 @@ -41,6 +41,26 @@ ]; // no more wildcard patterns here, UI can display only html and txt anyway +// All licenses have their own unique ID +list <string> license_ids = []; + +/** + * Checks the string that might contain ID of a license and + * eventually returns that id. + * See also GetIdPlease for a better ratio of successful stories. + */ +string GetId (string id_text) { + string id = nil; + + if (regexpmatch (id_text, "^license_language_[[:digit:]]+")) { + id = regexpsub (id_text, "^license_language_([[:digit:]]+)", "\\1"); + } else { + y2error ("Cannot get ID from %1", id_text); + } + + return id; +} + // Helper func. Cuts encoding suffix off the LANG // env. variable i.e. foo_BAR.UTF-8 => foo_BAR string EnvLangToLangCode ( string env_lang ) @@ -110,7 +130,11 @@ string WhichLicenceFile (string license_language, map <string, string> & licenses) { string license_file = licenses[license_language]:""; - y2milestone ("Using license file: %1", license_file); + if (license_file == nil || license_file == "") { + y2error ("No license file defined for language '%1' in %2", license_language, licenses); + } else { + y2milestone ("Using license file: %1", license_file); + } return license_file; } @@ -144,7 +168,8 @@ // filename printed in the license dialog string license_file_print = nil; -term GetLicenseDialogTerm (list<string> languages, string license_language, map <string, string> & licenses) { + +term GetLicenseDialogTerm (list<string> languages, string license_language, map <string, string> & licenses, string id) { string license_text = ""; term rt = GetLicenseContent (license_language, licenses); @@ -221,18 +246,19 @@ lang_selector_options = add (lang_selector_options, `disabled); } + license_ids = toset (add (license_ids, id)); + return `VBox ( // combo box - `Left (`ComboBox (`id (`lang), lang_selector_options, _("&Language"), - langs)), - `ReplacePoint (`id (`license_rp), rt) + `Left (`ComboBox (`id (sformat("license_language_%1", id)), lang_selector_options, _("&Language"), langs)), + `ReplacePoint (`id (sformat("license_contents_rp_%1", id)), rt) ); } // BNC #448598 // no-acceptance-needed file in license.tar.gz means the license // doesn't have to be accepted by user, just displayed -boolean license_acceptance_needed = true; +map <string, boolean> license_acceptance_needed = $[]; /** * Returns whether accepting the license manually is requied. @@ -240,22 +266,22 @@ * @see BNC #448598 * @return boolean if required */ -global boolean AcceptanceNeeded () { - return (license_acceptance_needed == true); +global boolean AcceptanceNeeded (string id) { + return license_acceptance_needed[id]:true; } -void SetAcceptanceNeeded (boolean new_value) { +void SetAcceptanceNeeded (string id, boolean new_value) { if (new_value == nil) { - y2error ("Undefined behavior, AcceptanceNeeded: %1", new_value); + y2error ("Undefined behavior (License ID %1), AcceptanceNeeded: %2", id, new_value); return; } - license_acceptance_needed = new_value; + license_acceptance_needed[id] = new_value; - if (license_acceptance_needed) { - y2milestone ("License agreement WILL be required"); + if (new_value == true) { + y2milestone ("License agreement (ID %1) WILL be required", id); } else { - y2milestone ("License agreement will NOT be required"); + y2milestone ("License agreement (ID %1) will NOT be required", id); } } @@ -263,7 +289,7 @@ * Displays License with Help and ( ) Yes / ( ) No radio buttons * @param string file with the license */ -void DisplayLicenseDialog (list<string> languages, boolean back, string license_language, map <string, string> & licenses) { +void DisplayLicenseDialog (list<string> languages, boolean back, string license_language, map <string, string> & licenses, string id) { map display = UI::GetDisplayInfo(); integer space = display["TextMode"]:true ? 1 : 3; @@ -296,13 +322,13 @@ `VSpacing (1), `HBox ( `HSpacing (2*space), - GetLicenseDialogTerm (languages, license_language, licenses), + GetLicenseDialogTerm (languages, license_language, licenses, id), `HSpacing (2*space) ), // BNC #448598 // yes/no buttons exist only if needed // if they don't exist, user is not asked to accept the license later - (AcceptanceNeeded() ? + (AcceptanceNeeded (id) ? license_buttons : `Empty() @@ -336,7 +362,7 @@ // If acceptance is not needed, there's no need to disable the button // by default - boolean default_next_button_state = (AcceptanceNeeded() ? false : true); + boolean default_next_button_state = (AcceptanceNeeded (id) ? false : true); Wizard::SetContents(caption, contents, help, back, default_next_button_state); @@ -352,7 +378,7 @@ * @param string temporary directory path */ void CleanUpLicense (string tmpdir) { - if (tmpdir != nil) + if (tmpdir != nil && tmpdir != "/") SCR::Execute (.target.bash_output, sformat ("rm -rf '%1'", String::Quote(tmpdir)) ); @@ -581,7 +607,9 @@ // Functions for handling different locations of licenses <-- void GetSourceLicenseDirectory (integer src_id, string fallback_dir) { - y2milestone ("Searching for licenses..."); + y2milestone ("Searching for licenses... (src_id: %1, fallback_dir: %2, mode: %3, stage: %4)", + src_id, fallback_dir, Mode::mode(), Stage::stage()); + license_file_print = nil; // Bugzilla #299732 @@ -603,7 +631,7 @@ // bugzilla #298342 } else if (Stage::initial() && src_id == nil) { - SearchForLicense_FirstStageBaseProduct (src_id, fallback_dir); + SearchForLicense_FirstStageBaseProduct ((src_id == nil ? Pkg::SourceGetCurrent(true)[0]:0 : src_id), fallback_dir); // Add-on-product license // * Source ID is set @@ -623,11 +651,16 @@ string lic_lang = ""; symbol InitLicenseData (integer src_id, string dir, map <string, string> & licenses, - list <string> & available_langs, boolean require_agreement, string & license_ident) { + list <string> & available_langs, boolean require_agreement, string & license_ident, string id) { GetSourceLicenseDirectory (src_id, dir); + // License does not need to be accepted. Well, I mean, manually selected "Yes, of course, I agree..." if (FileUtils::Exists (sformat ("%1/no-acceptance-needed", license_dir))) { - SetAcceptanceNeeded (false); + if (id == nil) { + y2error ("Parameter id not set"); + } else { + SetAcceptanceNeeded (id, false); + } } licenses = LicenseFiles (license_dir, @@ -733,35 +766,85 @@ } // Should have been named 'UpdateLicenseContentBasedOnSelectedLanguage' :-> -void UpdateLicenseContent (map <string, string> & licenses) { +void UpdateLicenseContent (map <string, string> & licenses, string id) { // read the selected language - lic_lang = (string) UI::QueryWidget (`id (`lang), `Value); - UI::ReplaceWidget (`id (`license_rp), GetLicenseContent (lic_lang, licenses)); + lic_lang = (string) UI::QueryWidget (`id (sformat ("license_language_%1", id)), `Value); + term rp_id = `id (sformat ("license_contents_rp_%1", id)); + if (UI::WidgetExists (rp_id)) { + UI::ReplaceWidget (rp_id, GetLicenseContent (lic_lang, licenses)); + } else { + y2error ("No such widget: %1", rp_id); + } +} + +boolean AllLicensesAccepted () { + // BNC #448598 + // If buttons don't exist, eula is automatically accepted + boolean accepted = true; + string eula_id = nil; + + foreach (string one_license_id, license_ids, { + if (AcceptanceNeeded (one_license_id)) + return; + + eula_id = sformat ("eula_%1", one_license_id); + if ((boolean) UI::WidgetExists (`id (eula_id)) != true) { + y2error ("Widget %1 does not exist", eula_id); + return; + } + + // All licenses have to be accepted + if ((symbol) UI::QueryWidget(`id (eula_id), `CurrentButton) != `yes) { + accepted = false; + break; + } + }); + + return accepted; +} + +boolean AllLicensesAcceptedOrDeclined () { + boolean ret = true; + + string eula_id = nil; + foreach (string one_license_id, license_ids, { + if (AcceptanceNeeded (one_license_id)) + return; + + eula_id = sformat ("eula_%1", one_license_id); + if ((boolean) UI::WidgetExists (`id (eula_id)) != true) { + y2error ("Widget %1 does not exist", eula_id); + } + + symbol current_button = (symbol) UI::QueryWidget(`id (eula_id), `CurrentButton); + // license have to be accepted or declined + if (current_button != `yes && current_button != `no) { + y2warning ("License %1 hasn't been accepted or declined", eula_id); + ret = false; + break; + } + }); + + return ret; } symbol HandleLicenseDialogRet (map <string, string> & licenses, boolean base_product, string action) { - symbol ret = nil; + any ret = nil; while (true) { - ret = (symbol) UI::UserInput(); + ret = UI::UserInput(); - if (ret == `lang) { - UpdateLicenseContent (licenses); + if (is (ret, string) && regexpmatch (tostring (ret), "^license_language_[[:digit:]]+$")) { + UpdateLicenseContent (licenses, GetId (tostring (ret))); + ret = `language; // bugzilla #303828 // disabled next button unless yes/no is selected } else if (ret == `yes || ret == `no) { - Wizard::EnableNextButton(); + if (AllLicensesAcceptedOrDeclined()) + Wizard::EnableNextButton(); } - // BNC #448598 - // If buttons don't exist, eula is automatically accepted - symbol accept = (AcceptanceNeeded() ? - (symbol) UI::QueryWidget(`id(`eula), `CurrentButton) - : - `yes - ); - // Aborting the license dialog if (ret == `abort) { // bugzilla #218677 @@ -783,7 +866,7 @@ else if (ret == `next) { // License declined - if (accept == `no) + if (AllLicensesAccepted() != true) { // message is void in case not accepting license doesn't stop the installation if (action == "continue") @@ -841,18 +924,12 @@ } } // License accepted - else if (accept == `yes) + else { - y2milestone("License has been accepted."); + y2milestone("All licenses have been accepted."); ret = `accepted; break; } - else - { - // message popup - Popup::Message(_("Accept or decline the license agreement.")); - continue; - } } else if (ret == `back) { @@ -861,12 +938,13 @@ } } - return ret; + return (symbol) ret; } /** * Ask user to confirm license agreement - * @param src_id integer repository to get the license from + * @param src_id integer repository to get the license from. + * If set to 'nil', the license is considered to belong to a base product * @param dir string directory to look for the license in if src_id is nil * and not 1st stage installation * @param patterns a list of patterns for the files, regular expressions @@ -877,17 +955,19 @@ * @param require_agreement means that even if the license (or the very same license) * has been already accepetd, ask user to accept it again (because of 'going back' * in the installation proposal). + * @param string id, usually source id but it can be any unique id in UI. Well, of course + * it must be string. */ global symbol AskLicenseAgreement (integer src_id, string dir, list<string> patterns, string action, boolean enable_back, - boolean base_product, boolean require_agreement) + boolean base_product, boolean require_agreement, string id) { lic_lang = ""; map <string, string> licenses = $[]; list <string> available_langs = []; string license_ident = ""; - symbol init_ret = InitLicenseData (src_id, dir, licenses, available_langs, require_agreement, license_ident); + symbol init_ret = InitLicenseData (src_id, dir, licenses, available_langs, require_agreement, license_ident, id); if (init_ret == `auto || init_ret == `accepted) { y2milestone ("Returning %1", init_ret); @@ -904,7 +984,7 @@ created_new_dialog = true; } - DisplayLicenseDialog (available_langs, enable_back, lic_lang, licenses); + DisplayLicenseDialog (available_langs, enable_back, lic_lang, licenses, id /* license id */); // Display info as a popup if exists if (info_file != nil) @@ -942,10 +1022,11 @@ license_patterns, "abort", // back button is disabled - false, false, false); + false, false, false, + tostring(src_id)); } -global symbol AskFirstStageLicenseAgreement (string action) { +global symbol AskFirstStageLicenseAgreement (integer src_id, string action) { // bug #223258 // disabling back button when the select-language dialog is skipped // @@ -953,41 +1034,44 @@ if (Language::selection_skipped) enable_back = false; - return AskLicenseAgreement (nil, "", + return AskLicenseAgreement (nil /* base product */, "", license_patterns, action, // back button is enabled - enable_back, true, true); + enable_back, true, true, + // unique id + tostring (src_id)); } -boolean info_file_already_seen = false; +// FIXME: map <string, boolean> ... +map <string, boolean> info_file_already_seen = $[]; /** * Called from the first stage Welcome dialog by clicking on a button */ -global boolean ShowFullScreenLicenseInInstallation (any replace_point_ID) { +global boolean ShowFullScreenLicenseInInstallation (any replace_point_ID, integer src_id) { lic_lang = ""; map <string, string> licenses = $[]; list <string> available_langs = []; string license_ident = ""; - symbol init_ret = InitLicenseData (nil, "", licenses, available_langs, true, license_ident); + symbol init_ret = InitLicenseData (nil /* base product */, "", licenses, available_langs, true, license_ident, tostring (src_id)); // Replaces the dialog content with Languages combo-box // and the current license text (richtext) UI::ReplaceWidget ( `id (replace_point_ID), - GetLicenseDialogTerm (available_langs, lic_lang, licenses) + GetLicenseDialogTerm (available_langs, lic_lang, licenses, tostring(src_id)) ); - symbol ret = nil; + any ret = nil; while (true) { - ret = (symbol) UI::UserInput(); + ret = UI::UserInput(); - if (ret == `lang) { - UpdateLicenseContent (licenses); + if (is (ret, string) && regexpmatch (tostring (ret), "^license_language_[[:digit:]]+")) { + UpdateLicenseContent (licenses, GetId (tostring (ret))); } else { break; } @@ -999,24 +1083,26 @@ /** * Used in the first-stage Welcome dialog */ -global boolean ShowLicenseInInstallation (any replace_point_ID) { +global boolean ShowLicenseInInstallation (any replace_point_ID, integer src_id) { lic_lang = ""; map <string, string> licenses = $[]; list <string> available_langs = []; string license_ident = ""; - symbol init_ret = InitLicenseData (nil, "", licenses, available_langs, true, license_ident); + symbol init_ret = InitLicenseData (nil /* base product */, "", licenses, available_langs, true, license_ident, tostring (src_id)); term rt = GetLicenseContent (lic_lang, licenses); UI::ReplaceWidget (`id (replace_point_ID), rt); + string id = tostring (src_id); + // Display info as a popup if exists - if (info_file != nil && ! info_file_already_seen) { + if (info_file != nil && info_file_already_seen[id]:false != true) { if (Mode::autoinst()) { y2milestone ("Autoinstallation: Skipping info file..."); } else { InstShowInfo::show_info_txt (info_file); - info_file_already_seen = true; + info_file_already_seen[id] = true; } } @@ -1024,10 +1110,9 @@ } global symbol AskInstalledLicenseAgreement (string directory, - list<string> patterns, string action) + list<string> patterns, string action, string id) { - return AskLicenseAgreement (nil, directory, patterns, action, false, true, false); - + return AskLicenseAgreement (nil, directory, patterns, action, false, true, false, id); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60080 - in /branches/SuSE-Code-11-SP1-Branch/packager: package/yast2-packager.changes src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 11 Dec '09

11 Dec '09

Author: locilka Date: Fri Dec 11 16:51:51 2009 New Revision: 60080 URL: http://svn.opensuse.org/viewcvs/yast?rev=60080&view=rev Log: ProductLicense prepared for multi-license dialogs (FATE #306295). Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Fri Dec 11 16:51:51 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Dec 11 16:48:58 CET 2009 - locilka(a)suse.cz + +- ProductLicense prepared for multi-license dialogs (FATE #306295). + +------------------------------------------------------------------- Tue Nov 24 15:32:33 CET 2009 - locilka(a)suse.cz - Creating backup of old repositories at the end of initial Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp Fri Dec 11 16:51:51 2009 @@ -41,6 +41,26 @@ ]; // no more wildcard patterns here, UI can display only html and txt anyway +// All licenses have their own unique ID +list <string> license_ids = []; + +/** + * Checks the string that might contain ID of a license and + * eventually returns that id. + * See also GetIdPlease for a better ratio of successful stories. + */ +string GetId (string id_text) { + string id = nil; + + if (regexpmatch (id_text, "^license_language_[[:digit:]]+")) { + id = regexpsub (id_text, "^license_language_([[:digit:]]+)", "\\1"); + } else { + y2error ("Cannot get ID from %1", id_text); + } + + return id; +} + // Helper func. Cuts encoding suffix off the LANG // env. variable i.e. foo_BAR.UTF-8 => foo_BAR string EnvLangToLangCode ( string env_lang ) @@ -110,7 +130,11 @@ string WhichLicenceFile (string license_language, map <string, string> & licenses) { string license_file = licenses[license_language]:""; - y2milestone ("Using license file: %1", license_file); + if (license_file == nil || license_file == "") { + y2error ("No license file defined for language '%1' in %2", license_language, licenses); + } else { + y2milestone ("Using license file: %1", license_file); + } return license_file; } @@ -144,7 +168,8 @@ // filename printed in the license dialog string license_file_print = nil; -term GetLicenseDialogTerm (list<string> languages, string license_language, map <string, string> & licenses) { + +term GetLicenseDialogTerm (list<string> languages, string license_language, map <string, string> & licenses, string id) { string license_text = ""; term rt = GetLicenseContent (license_language, licenses); @@ -221,18 +246,19 @@ lang_selector_options = add (lang_selector_options, `disabled); } + license_ids = toset (add (license_ids, id)); + return `VBox ( // combo box - `Left (`ComboBox (`id (`lang), lang_selector_options, _("&Language"), - langs)), - `ReplacePoint (`id (`license_rp), rt) + `Left (`ComboBox (`id (sformat("license_language_%1", id)), lang_selector_options, _("&Language"), langs)), + `ReplacePoint (`id (sformat("license_contents_rp_%1", id)), rt) ); } // BNC #448598 // no-acceptance-needed file in license.tar.gz means the license // doesn't have to be accepted by user, just displayed -boolean license_acceptance_needed = true; +map <string, boolean> license_acceptance_needed = $[]; /** * Returns whether accepting the license manually is requied. @@ -240,22 +266,22 @@ * @see BNC #448598 * @return boolean if required */ -global boolean AcceptanceNeeded () { - return (license_acceptance_needed == true); +global boolean AcceptanceNeeded (string id) { + return license_acceptance_needed[id]:true; } -void SetAcceptanceNeeded (boolean new_value) { +void SetAcceptanceNeeded (string id, boolean new_value) { if (new_value == nil) { - y2error ("Undefined behavior, AcceptanceNeeded: %1", new_value); + y2error ("Undefined behavior (License ID %1), AcceptanceNeeded: %2", id, new_value); return; } - license_acceptance_needed = new_value; + license_acceptance_needed[id] = new_value; - if (license_acceptance_needed) { - y2milestone ("License agreement WILL be required"); + if (new_value == true) { + y2milestone ("License agreement (ID %1) WILL be required", id); } else { - y2milestone ("License agreement will NOT be required"); + y2milestone ("License agreement (ID %1) will NOT be required", id); } } @@ -263,7 +289,7 @@ * Displays License with Help and ( ) Yes / ( ) No radio buttons * @param string file with the license */ -void DisplayLicenseDialog (list<string> languages, boolean back, string license_language, map <string, string> & licenses) { +void DisplayLicenseDialog (list<string> languages, boolean back, string license_language, map <string, string> & licenses, string id) { map display = UI::GetDisplayInfo(); integer space = display["TextMode"]:true ? 1 : 3; @@ -296,13 +322,13 @@ `VSpacing (1), `HBox ( `HSpacing (2*space), - GetLicenseDialogTerm (languages, license_language, licenses), + GetLicenseDialogTerm (languages, license_language, licenses, id), `HSpacing (2*space) ), // BNC #448598 // yes/no buttons exist only if needed // if they don't exist, user is not asked to accept the license later - (AcceptanceNeeded() ? + (AcceptanceNeeded (id) ? license_buttons : `Empty() @@ -336,7 +362,7 @@ // If acceptance is not needed, there's no need to disable the button // by default - boolean default_next_button_state = (AcceptanceNeeded() ? false : true); + boolean default_next_button_state = (AcceptanceNeeded (id) ? false : true); Wizard::SetContents(caption, contents, help, back, default_next_button_state); @@ -352,7 +378,7 @@ * @param string temporary directory path */ void CleanUpLicense (string tmpdir) { - if (tmpdir != nil) + if (tmpdir != nil && tmpdir != "/") SCR::Execute (.target.bash_output, sformat ("rm -rf '%1'", String::Quote(tmpdir)) ); @@ -581,7 +607,9 @@ // Functions for handling different locations of licenses <-- void GetSourceLicenseDirectory (integer src_id, string fallback_dir) { - y2milestone ("Searching for licenses..."); + y2milestone ("Searching for licenses... (src_id: %1, fallback_dir: %2, mode: %3, stage: %4)", + src_id, fallback_dir, Mode::mode(), Stage::stage()); + license_file_print = nil; // Bugzilla #299732 @@ -603,7 +631,7 @@ // bugzilla #298342 } else if (Stage::initial() && src_id == nil) { - SearchForLicense_FirstStageBaseProduct (src_id, fallback_dir); + SearchForLicense_FirstStageBaseProduct ((src_id == nil ? Pkg::SourceGetCurrent(true)[0]:0 : src_id), fallback_dir); // Add-on-product license // * Source ID is set @@ -623,11 +651,16 @@ string lic_lang = ""; symbol InitLicenseData (integer src_id, string dir, map <string, string> & licenses, - list <string> & available_langs, boolean require_agreement, string & license_ident) { + list <string> & available_langs, boolean require_agreement, string & license_ident, string id) { GetSourceLicenseDirectory (src_id, dir); + // License does not need to be accepted. Well, I mean, manually selected "Yes, of course, I agree..." if (FileUtils::Exists (sformat ("%1/no-acceptance-needed", license_dir))) { - SetAcceptanceNeeded (false); + if (id == nil) { + y2error ("Parameter id not set"); + } else { + SetAcceptanceNeeded (id, false); + } } licenses = LicenseFiles (license_dir, @@ -733,35 +766,85 @@ } // Should have been named 'UpdateLicenseContentBasedOnSelectedLanguage' :-> -void UpdateLicenseContent (map <string, string> & licenses) { +void UpdateLicenseContent (map <string, string> & licenses, string id) { // read the selected language - lic_lang = (string) UI::QueryWidget (`id (`lang), `Value); - UI::ReplaceWidget (`id (`license_rp), GetLicenseContent (lic_lang, licenses)); + lic_lang = (string) UI::QueryWidget (`id (sformat ("license_language_%1", id)), `Value); + term rp_id = `id (sformat ("license_contents_rp_%1", id)); + if (UI::WidgetExists (rp_id)) { + UI::ReplaceWidget (rp_id, GetLicenseContent (lic_lang, licenses)); + } else { + y2error ("No such widget: %1", rp_id); + } +} + +boolean AllLicensesAccepted () { + // BNC #448598 + // If buttons don't exist, eula is automatically accepted + boolean accepted = true; + string eula_id = nil; + + foreach (string one_license_id, license_ids, { + if (AcceptanceNeeded (one_license_id)) + return; + + eula_id = sformat ("eula_%1", one_license_id); + if ((boolean) UI::WidgetExists (`id (eula_id)) != true) { + y2error ("Widget %1 does not exist", eula_id); + return; + } + + // All licenses have to be accepted + if ((symbol) UI::QueryWidget(`id (eula_id), `CurrentButton) != `yes) { + accepted = false; + break; + } + }); + + return accepted; +} + +boolean AllLicensesAcceptedOrDeclined () { + boolean ret = true; + + string eula_id = nil; + foreach (string one_license_id, license_ids, { + if (AcceptanceNeeded (one_license_id)) + return; + + eula_id = sformat ("eula_%1", one_license_id); + if ((boolean) UI::WidgetExists (`id (eula_id)) != true) { + y2error ("Widget %1 does not exist", eula_id); + } + + symbol current_button = (symbol) UI::QueryWidget(`id (eula_id), `CurrentButton); + // license have to be accepted or declined + if (current_button != `yes && current_button != `no) { + y2warning ("License %1 hasn't been accepted or declined", eula_id); + ret = false; + break; + } + }); + + return ret; } symbol HandleLicenseDialogRet (map <string, string> & licenses, boolean base_product, string action) { - symbol ret = nil; + any ret = nil; while (true) { - ret = (symbol) UI::UserInput(); + ret = UI::UserInput(); - if (ret == `lang) { - UpdateLicenseContent (licenses); + if (is (ret, string) && regexpmatch (tostring (ret), "^license_language_[[:digit:]]+$")) { + UpdateLicenseContent (licenses, GetId (tostring (ret))); + ret = `language; // bugzilla #303828 // disabled next button unless yes/no is selected } else if (ret == `yes || ret == `no) { - Wizard::EnableNextButton(); + if (AllLicensesAcceptedOrDeclined()) + Wizard::EnableNextButton(); } - // BNC #448598 - // If buttons don't exist, eula is automatically accepted - symbol accept = (AcceptanceNeeded() ? - (symbol) UI::QueryWidget(`id(`eula), `CurrentButton) - : - `yes - ); - // Aborting the license dialog if (ret == `abort) { // bugzilla #218677 @@ -783,7 +866,7 @@ else if (ret == `next) { // License declined - if (accept == `no) + if (AllLicensesAccepted() != true) { // message is void in case not accepting license doesn't stop the installation if (action == "continue") @@ -841,18 +924,12 @@ } } // License accepted - else if (accept == `yes) + else { - y2milestone("License has been accepted."); + y2milestone("All licenses have been accepted."); ret = `accepted; break; } - else - { - // message popup - Popup::Message(_("Accept or decline the license agreement.")); - continue; - } } else if (ret == `back) { @@ -861,12 +938,13 @@ } } - return ret; + return (symbol) ret; } /** * Ask user to confirm license agreement - * @param src_id integer repository to get the license from + * @param src_id integer repository to get the license from. + * If set to 'nil', the license is considered to belong to a base product * @param dir string directory to look for the license in if src_id is nil * and not 1st stage installation * @param patterns a list of patterns for the files, regular expressions @@ -877,17 +955,19 @@ * @param require_agreement means that even if the license (or the very same license) * has been already accepetd, ask user to accept it again (because of 'going back' * in the installation proposal). + * @param string id, usually source id but it can be any unique id in UI. Well, of course + * it must be string. */ global symbol AskLicenseAgreement (integer src_id, string dir, list<string> patterns, string action, boolean enable_back, - boolean base_product, boolean require_agreement) + boolean base_product, boolean require_agreement, string id) { lic_lang = ""; map <string, string> licenses = $[]; list <string> available_langs = []; string license_ident = ""; - symbol init_ret = InitLicenseData (src_id, dir, licenses, available_langs, require_agreement, license_ident); + symbol init_ret = InitLicenseData (src_id, dir, licenses, available_langs, require_agreement, license_ident, id); if (init_ret == `auto || init_ret == `accepted) { y2milestone ("Returning %1", init_ret); @@ -904,7 +984,7 @@ created_new_dialog = true; } - DisplayLicenseDialog (available_langs, enable_back, lic_lang, licenses); + DisplayLicenseDialog (available_langs, enable_back, lic_lang, licenses, id /* license id */); // Display info as a popup if exists if (info_file != nil) @@ -942,10 +1022,11 @@ license_patterns, "abort", // back button is disabled - false, false, false); + false, false, false, + tostring(src_id)); } -global symbol AskFirstStageLicenseAgreement (string action) { +global symbol AskFirstStageLicenseAgreement (integer src_id, string action) { // bug #223258 // disabling back button when the select-language dialog is skipped // @@ -953,41 +1034,44 @@ if (Language::selection_skipped) enable_back = false; - return AskLicenseAgreement (nil, "", + return AskLicenseAgreement (nil /* base product */, "", license_patterns, action, // back button is enabled - enable_back, true, true); + enable_back, true, true, + // unique id + tostring (src_id)); } -boolean info_file_already_seen = false; +// FIXME: map <string, boolean> ... +map <string, boolean> info_file_already_seen = $[]; /** * Called from the first stage Welcome dialog by clicking on a button */ -global boolean ShowFullScreenLicenseInInstallation (any replace_point_ID) { +global boolean ShowFullScreenLicenseInInstallation (any replace_point_ID, integer src_id) { lic_lang = ""; map <string, string> licenses = $[]; list <string> available_langs = []; string license_ident = ""; - symbol init_ret = InitLicenseData (nil, "", licenses, available_langs, true, license_ident); + symbol init_ret = InitLicenseData (nil /* base product */, "", licenses, available_langs, true, license_ident, tostring (src_id)); // Replaces the dialog content with Languages combo-box // and the current license text (richtext) UI::ReplaceWidget ( `id (replace_point_ID), - GetLicenseDialogTerm (available_langs, lic_lang, licenses) + GetLicenseDialogTerm (available_langs, lic_lang, licenses, tostring(src_id)) ); - symbol ret = nil; + any ret = nil; while (true) { - ret = (symbol) UI::UserInput(); + ret = UI::UserInput(); - if (ret == `lang) { - UpdateLicenseContent (licenses); + if (is (ret, string) && regexpmatch (tostring (ret), "^license_language_[[:digit:]]+")) { + UpdateLicenseContent (licenses, GetId (tostring (ret))); } else { break; } @@ -999,24 +1083,26 @@ /** * Used in the first-stage Welcome dialog */ -global boolean ShowLicenseInInstallation (any replace_point_ID) { +global boolean ShowLicenseInInstallation (any replace_point_ID, integer src_id) { lic_lang = ""; map <string, string> licenses = $[]; list <string> available_langs = []; string license_ident = ""; - symbol init_ret = InitLicenseData (nil, "", licenses, available_langs, true, license_ident); + symbol init_ret = InitLicenseData (nil /* base product */, "", licenses, available_langs, true, license_ident, tostring (src_id)); term rt = GetLicenseContent (lic_lang, licenses); UI::ReplaceWidget (`id (replace_point_ID), rt); + string id = tostring (src_id); + // Display info as a popup if exists - if (info_file != nil && ! info_file_already_seen) { + if (info_file != nil && info_file_already_seen[id]:false != true) { if (Mode::autoinst()) { y2milestone ("Autoinstallation: Skipping info file..."); } else { InstShowInfo::show_info_txt (info_file); - info_file_already_seen = true; + info_file_already_seen[id] = true; } } @@ -1024,10 +1110,9 @@ } global symbol AskInstalledLicenseAgreement (string directory, - list<string> patterns, string action) + list<string> patterns, string action, string id) { - return AskLicenseAgreement (nil, directory, patterns, action, false, true, false); - + return AskLicenseAgreement (nil, directory, patterns, action, false, true, false, id); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60079 - /tags/stable-2_17_0/testsuite/
by aschnell＠svn.opensuse.org 11 Dec '09

11 Dec '09

Author: aschnell Date: Fri Dec 11 16:42:56 2009 New Revision: 60079 URL: http://svn.opensuse.org/viewcvs/yast?rev=60079&view=rev Log: Created tag stable-2_17_0 for testsuite Added: tags/stable-2_17_0/testsuite/ - copied from r60078, trunk/testsuite/ -- 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] r60078 - /trunk/testsuite/skel/Makefile.testsuite.in
by aschnell＠svn.opensuse.org 11 Dec '09

11 Dec '09

Author: aschnell Date: Fri Dec 11 16:40:27 2009 New Revision: 60078 URL: http://svn.opensuse.org/viewcvs/yast?rev=60078&view=rev Log: - cleanup Modified: trunk/testsuite/skel/Makefile.testsuite.in Modified: trunk/testsuite/skel/Makefile.testsuite.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/skel/Makefile.testsuit… ============================================================================== --- trunk/testsuite/skel/Makefile.testsuite.in (original) +++ trunk/testsuite/skel/Makefile.testsuite.in Fri Dec 11 16:40:27 2009 @@ -31,9 +31,6 @@ $(srcdir)/Makefile.am: $(skeldir)/Makefile_am cmp -s $< $@ || cp -f $< $@ -$(srcdir)/.cvsignore: $(skeldir)/_cvsignore - cp -f $< $@ - $(srcdir)/run/runtest.sh: $(skeldir)/runtest.sh run cp -f $< $@ chmod +x $@ -- 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] r60077 - /trunk/storage/storage/src/testsuite/yast2-storage.test/testsuite.exp
by aschnell＠svn.opensuse.org 11 Dec '09

11 Dec '09

Author: aschnell Date: Fri Dec 11 16:28:23 2009 New Revision: 60077 URL: http://svn.opensuse.org/viewcvs/yast?rev=60077&view=rev Log: - updated Modified: trunk/storage/storage/src/testsuite/yast2-storage.test/testsuite.exp Modified: trunk/storage/storage/src/testsuite/yast2-storage.test/testsuite.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/ya… ============================================================================== --- trunk/storage/storage/src/testsuite/yast2-storage.test/testsuite.exp (original) +++ trunk/storage/storage/src/testsuite/yast2-storage.test/testsuite.exp Fri Dec 11 16:28:23 2009 @@ -6,7 +6,7 @@ # Author: # Michal Svec <msvec(a)suse.cz> # -# $Id: testsuite.exp 13187 2004-01-13 14:54:45Z msvec $ +# $Id: testsuite.exp 60074 2009-12-11 15:09:27Z aschnell $ global CASE # there must be a space before the closing brace! @@ -19,10 +19,6 @@ puts "\nChecking started\n" -foreach file $filenames { - if {[testsuite-run $file] < 0} { - return - } -} +foreach file $filenames { testsuite-run $file } puts "\nChecking finished\n" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0