Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-packager -> sle12 ## BNC# 890968 : "[RC1] installer don't show license agreement when adding second extension" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-packager/yast2-packager.changes 2014-08-06 16:43:18.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-packager/yast2-packager.changes 2014-08-15 10:48:35.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Aug 13 17:21:11 CEST 2014 - locilka@suse.com + +- Removed caching of already accepted licenses: if there is + a license that needs to be accepted, user has to accept it + (bnc#890968) +- 3.1.40 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-packager - at least 26 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-packager (Old) and /mounts/work_src_done/SLE12/yast2-packager (BS:build ID:42714 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-packager-3.1.39.tar.bz2 New: ---- yast2-packager-3.1.40.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.yzQ9wR/_old 2014-08-15 12:13:07.000000000 +0200 +++ /var/tmp/diff_new_pack.yzQ9wR/_new 2014-08-15 12:13:07.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.39 +Version: 3.1.40 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-packager-3.1.39.tar.bz2 -> yast2-packager-3.1.40.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.39/package/yast2-packager.changes new/yast2-packager-3.1.40/package/yast2-packager.changes --- old/yast2-packager-3.1.39/package/yast2-packager.changes 2014-08-06 15:15:19.000000000 +0200 +++ new/yast2-packager-3.1.40/package/yast2-packager.changes 2014-08-15 10:43:41.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Aug 13 17:21:11 CEST 2014 - locilka@suse.com + +- Removed caching of already accepted licenses: if there is + a license that needs to be accepted, user has to accept it + (bnc#890968) +- 3.1.40 + +------------------------------------------------------------------- Wed Aug 6 13:31:31 CEST 2014 - locilka@suse.com - Cleanup in license dialog handling, especially in handling while diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.39/package/yast2-packager.spec new/yast2-packager-3.1.40/package/yast2-packager.spec --- old/yast2-packager-3.1.39/package/yast2-packager.spec 2014-08-06 15:15:19.000000000 +0200 +++ new/yast2-packager-3.1.40/package/yast2-packager.spec 2014-08-15 10:43:41.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.39 +Version: 3.1.40 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.39/src/modules/ProductLicense.rb new/yast2-packager-3.1.40/src/modules/ProductLicense.rb --- old/yast2-packager-3.1.39/src/modules/ProductLicense.rb 2014-08-06 15:15:20.000000000 +0200 +++ new/yast2-packager-3.1.40/src/modules/ProductLicense.rb 2014-08-15 10:43:41.000000000 +0200 @@ -40,9 +40,6 @@ textdomain "packager" - # list of already accepted licenses - @already_accepted_licenses = [] - @license_patterns = [ "license\\.html", "license\\.%1\\.html", @@ -105,40 +102,6 @@ Ops.get(tmp, 0, "") end - # Creates a unique identification from filename - # (MD5sum + file size) - # - # @param [String] filename - # @return [String] unique ID - def GetLicenseIdentString(filename) - if !FileUtils.Exists(filename) - Builtins.y2error("License '%1' doesn't exist", filename) - return nil - end - - filemd5 = FileUtils.MD5sum(filename) - return nil if filemd5 == nil - - ret = Builtins.sformat("%1-%2", filemd5, FileUtils.GetSize(filename)) - - Builtins.y2milestone("License ident for '%1' is '%2'", filename, ret) - - ret - end - - # Checks whether the license (file) has been already accepted - # - # @param string filename - # @return [Boolean] whether the license has been accepted before - def IsLicenseAlreadyAccepted(license_ident) - if license_ident == nil || license_ident == "" - Builtins.y2error("Wrong license ID '%1'", license_ident) - return false - end - - Builtins.contains(@already_accepted_licenses, license_ident) - end - # Sets that the license (file) has been already accepted # # @param string filename @@ -148,15 +111,6 @@ return end - Builtins.y2milestone( - "Adding License ID '%1' as already accepted", - license_ident - ) - @already_accepted_licenses = Builtins.add( - @already_accepted_licenses, - license_ident - ) - nil end @@ -934,25 +888,7 @@ licenses.value = licenses_ref.value; _WhichLicenceFile_result ) - license_ident.value = GetLicenseIdentString(base_license) - - # agreement might be required even if license has been already accepted - # defined, properly ($md5sum(32)-(1)$size(1..n)) - # - # see also BNC #448598 - # Even if it it shown it sometimes doesn't need to be even accepted by - # selecting "yes, I agree" - if require_agreement != true && - Builtins.tostring(license_ident.value) != nil && - Ops.greater_than(Builtins.size(license_ident.value), 33) && - IsLicenseAlreadyAccepted(license_ident.value) - Builtins.y2milestone("License has been already accepted/shown") - - CleanUpLicense(@tmpdir) - return :accepted - else - Builtins.y2milestone("License needs to be shown") - end + log.info "License needs to be shown" # bugzilla #303922 # src_id == nil (the initial product license) continue with "q"... Checked in at Fri Aug 15 12:13:21 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org