Hello community,
here is the log from the commit of package webyast-software-ws for
openSUSE:Factory
checked in at Thu May 19 13:20:56 CEST 2011.
--------
--- webyast-software-ws/webyast-software-ws.changes 2011-05-04
16:19:23.000000000 +0200
+++
/mounts/work_src_done/STABLE/webyast-software-ws/webyast-software-ws.changes
2011-05-17 12:50:17.000000000 +0200
@@ -1,0 +2,23 @@
+Tue May 17 10:44:17 UTC 2011 - [email protected]
+
+- remove signals correctly
+- 0.3.9
+
+-------------------------------------------------------------------
+Mon May 16 10:45:08 UTC 2011 - [email protected]
+
+- changed licence to the correct name GPL-2.0
+- 0.3.8
+
+-------------------------------------------------------------------
+Tue May 10 10:27:56 UTC 2011 - [email protected]
+
+- EULA handling fixed
+- 0.3.7
+
+-------------------------------------------------------------------
+Fri May 6 14:27:17 UTC 2011 - [email protected]
+
+- handle/checking running installation jobs
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ webyast-software-ws.spec ++++++
--- /var/tmp/diff_new_pack.IQvdOO/_old 2011-05-19 13:16:03.000000000 +0200
+++ /var/tmp/diff_new_pack.IQvdOO/_new 2011-05-19 13:16:03.000000000 +0200
@@ -44,11 +44,11 @@
%endif
%endif
-License: GPL v2 only
+License: GPL-2.0
Group: Productivity/Networking/Web/Utilities
Url: http://en.opensuse.org/Portal:WebYaST
AutoReqProv: on
-Version: 0.3.6
+Version: 0.3.9
Release: 1
Summary: WebYaST - software management service
Source: www.tar.bz2
++++++ www.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/www/app/controllers/patches_controller.rb
new/www/app/controllers/patches_controller.rb
--- old/www/app/controllers/patches_controller.rb 2011-04-20
12:44:33.000000000 +0200
+++ new/www/app/controllers/patches_controller.rb 2011-05-10
12:26:49.000000000 +0200
@@ -56,11 +56,7 @@
end
def check_running_install
- running = 0
- jobs = Delayed::Job.find(:all)
- jobs.each { |job|
- running += 1 if
job.handler.split("\n")[1].split[1].include?("patch:install:")
- } unless jobs.blank?
+ running = PluginJob.running(:Patch, :install)
Rails.logger.info("#{running} installation jobs in the queue")
Rails.cache.delete("patch:installed") if running == 0 #remove installed
patches from cache if the installation
#has been finished
@@ -137,9 +133,11 @@
# POST /patch_updates/
def create
permission_check "org.opensuse.yast.system.patches.install" # RORSCAN_ITL
- if params[:patches][:accept_license].present? ||
params[:patches][:reject_license].present?
- params[:patches][:accept_license].present? ? Patch.accept_license :
Patch.reject_license
- index
+ if params[:patches][:accept_license].present? ||
params[:patches][:reject_license].present?
+ params[:patches][:accept_license].present? ? Patch.accept_license :
Patch.reject_license
+ @patch_update = Patch.new({})
+ YastCache.delete(Plugin.new(),"patch")
+ render :show
return
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/www/app/models/patch.rb new/www/app/models/patch.rb
--- old/www/app/models/patch.rb 2011-05-04 14:27:58.000000000 +0200
+++ new/www/app/models/patch.rb 2011-05-10 12:26:49.000000000 +0200
@@ -127,6 +127,11 @@
@messages=[]
ret = do_install(pk_id,['RequireRestart','Message']) { |type, details|
Rails.logger.info "Message signal received: #{type}, #{details}"
+ if ["system", "application", "session"].include? type
+ # RequireRestart received
+ type = "notice"
+ details = _("Please reboot your system.")
+ end
@messages << {:kind => type, :details => details}
begin
dirname = File.dirname(MESSAGES_FILE)
@@ -148,6 +153,8 @@
Rails.cache.write("patch:installed", installed)
YastCache.delete(self,pk_id.split(';')[1])
+ #resetting status in order to get install messagas, EULAs,....
+ YastCache.reset(Plugin.new(),"patch")
return ret
end
@@ -167,7 +174,6 @@
def self.do_install(pk_id, signal_list = [], &block)
#locking PackageKit for single use
PackageKit.lock
-
ok = true
begin
transaction_iface, packagekit_iface = PackageKit.connect
@@ -197,7 +203,17 @@
#FIXME check if user already agree with license
if handle_eula(eula_id,license_text)
PackageKit.transact :AcceptEula, [eula_id],nil,nil
- PackageKit.transact :UpdatePackages, [[pk_id]], nil, nil
+ iface, dummy = PackageKit.connect
+ if iface.methods["UpdatePackages"] && # catch mocking
+ iface.methods["UpdatePackages"].params.size == 2 &&
+ iface.methods["UpdatePackages"].params[0][0] == "only_trusted"
+ #PackageKit of 11.2
+ iface.UpdatePackages(true, #only_trusted
+ [pk_id])
+ else
+ #PackageKit older versions like SLES11
+ iface.UpdatePackages([pk_id])
+ end
dbusloop.quit
else
ok = false
@@ -232,20 +248,18 @@
#unlocking PackageKit
PackageKit.unlock
end
-
return ok
end
def self.handle_eula(eula_id,license_text)
- #TODO check if user already accept exactly same license
- license_file = File.join(LICENSES_DIR,eula_id)
- File.open(license_file,"w") { |f| f.write license_text }
- while File.exists?(license_file)
- sleep 1 #prevent turning server into radiator
- end
accepted_path = File.join(ACCEPTED_LICENSES_DIR,eula_id)
ret = File.exists?(accepted_path) #eula is in accepted dir
- File.delete accepted_path if ret #require new confirmation every patch
same as zypper
+ if ret
+ File.delete accepted_path if ret #require new confirmation every patch
same as zypper
+ else
+ license_file = File.join(LICENSES_DIR,eula_id)
+ File.open(license_file,"w") { |f| f.write license_text }
+ end
ret
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/www/lib/packagekit.rb new/www/lib/packagekit.rb
--- old/www/lib/packagekit.rb 2011-04-20 12:42:18.000000000 +0200
+++ new/www/lib/packagekit.rb 2011-05-17 12:10:57.000000000 +0200
@@ -96,6 +96,7 @@
proxy.on_signal("Finished")
proxy.on_signal("RepoSignatureRequired")
proxy.on_signal("ErrorCode")
+ proxy.on_signal("RepoDetail")
end
public
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
