Hello community,
here is the log from the commit of package webyast-software-ws for
openSUSE:Factory
checked in at Fri Jun 17 10:41:27 CEST 2011.
--------
--- webyast-software-ws/webyast-software-ws.changes 2011-05-26
09:24:06.000000000 +0200
+++
/mounts/work_src_done/STABLE/webyast-software-ws/webyast-software-ws.changes
2011-06-16 11:50:33.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Jun 16 08:39:25 UTC 2011 - [email protected]
+
+- accepting more than one EULA in a patch (bnc#698416)
+- 0.3.12
+
+-------------------------------------------------------------------
+Tue Jun 7 08:34:55 UTC 2011 - [email protected]
+
+- Updated Czech translations (jsrain)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ webyast-software-ws.spec ++++++
--- /var/tmp/diff_new_pack.czMuRn/_old 2011-06-17 10:39:14.000000000 +0200
+++ /var/tmp/diff_new_pack.czMuRn/_new 2011-06-17 10:39:14.000000000 +0200
@@ -48,7 +48,7 @@
Group: Productivity/Networking/Web/Utilities
Url: http://en.opensuse.org/Portal:WebYaST
AutoReqProv: on
-Version: 0.3.11
+Version: 0.3.12
Release: 1
Summary: WebYaST - software management service
Source: www.tar.bz2
@@ -111,6 +111,9 @@
cp -a * $RPM_BUILD_ROOT%{plugin_dir}
rm -f $RPM_BUILD_ROOT%{plugin_dir}/COPYING
+# remove .po files (no longer needed)
+rm -rf $RPM_BUILD_ROOT/%{plugin_dir}/po
+
# Policies
mkdir -p $RPM_BUILD_ROOT/usr/share/PolicyKit/policy
install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/
++++++ www.tar.bz2 ++++++
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-10 12:26:49.000000000 +0200
+++ new/www/app/models/patch.rb 2011-06-16 10:41:20.000000000 +0200
@@ -194,32 +194,20 @@
error = ''
dbusloop = PackageKit.dbusloop proxy, error
dbusloop << proxy.bus
+ accept_eulas()
proxy.on_signal("Error") do |u1,u2|
ok = false
dbusloop.quit
end
+
proxy.on_signal("EulaRequired") do
|eula_id,package_id,vendor_name,license_text|
#FIXME check if user already agree with license
- if handle_eula(eula_id,license_text)
- PackageKit.transact :AcceptEula, [eula_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
- dbusloop.quit
- end
+ create_eula(eula_id,license_text)
+ ok = false
+ dbusloop.quit
end
+
if transaction_iface.methods["UpdatePackages"] && # catch mocking
transaction_iface.methods["UpdatePackages"].params.size == 2 &&
transaction_iface.methods["UpdatePackages"].params[0][0] ==
"only_trusted"
@@ -248,19 +236,40 @@
#unlocking PackageKit
PackageKit.unlock
end
+ remove_eulas() if ok
return ok
end
- def self.handle_eula(eula_id,license_text)
+ def self.create_eula(eula_id,license_text)
accepted_path = File.join(ACCEPTED_LICENSES_DIR,eula_id)
ret = File.exists?(accepted_path) #eula is in accepted dir
- if ret
- File.delete accepted_path if ret #require new confirmation every patch
same as zypper
- else
+ unless ret
license_file = File.join(LICENSES_DIR,eula_id)
File.open(license_file,"w") { |f| f.write license_text }
end
ret
end
+ def self.accept_eulas()
+ dir = Dir.new(ACCEPTED_LICENSES_DIR)
+ dir.each {|filename|
+ unless File.directory? filename
+ eula_id = File.basename filename
+ Rails.logger.info "accepting #{eula_id.inspect} ."
+ begin
+ PackageKit.transact :AcceptEula, [eula_id],nil,nil
+ rescue Exception => e
+ Rails.logger.info "accepting eula #{eula_id} failed: #{e.inspect}"
+ end
+ end
+ }
+ end
+
+ def self.remove_eulas()
+ dir = Dir.new(ACCEPTED_LICENSES_DIR)
+ dir.each {|filename|
+ File.delete(File.join(ACCEPTED_LICENSES_DIR,filename)) unless
File.directory? filename
+ }
+ end
+
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/www/po/cs/webyast-software-ws.po
new/www/po/cs/webyast-software-ws.po
--- old/www/po/cs/webyast-software-ws.po 1970-01-01 01:00:00.000000000
+0100
+++ new/www/po/cs/webyast-software-ws.po 2011-06-16 10:41:19.000000000
+0200
@@ -0,0 +1,26 @@
+# Jiri Srain <[email protected]>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: @PACKAGE@\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-04 11:25+0100\n"
+"PO-Revision-Date: 2011-06-02 16:10+0200\n"
+"Last-Translator: Jiri Srain <[email protected]>\n"
+"Language-Team: American English <[email protected]>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: app/models/patches_state.rb:33 app/models/patches_state.rb:33
+#| msgid "The installation source was not found."
+msgid "Patch installation messages not confirmed"
+msgstr "Zprávy instalace patche nebyly potvrzeny"
+
+# ok button label
+#: app/models/patches_state.rb:38 app/models/patches_state.rb:38
+msgid "OK"
+msgstr "OK"
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
