December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60155 - in /trunk/qt-pkg: package/yast2-qt-pkg.changes src/YQPackageSelector.cc src/YQPkgSearchFilterView.cc
by tgoettlicher＠svn.opensuse.org 21 Dec '09

21 Dec '09

Author: tgoettlicher Date: Mon Dec 21 12:42:22 2009 New Revision: 60155 URL: http://svn.opensuse.org/viewcvs/yast?rev=60155&view=rev Log: - fixed bnc #564321: Alt-P shortcut overloaded in YaST2 Software Management Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPackageSelector.cc trunk/qt-pkg/src/YQPkgSearchFilterView.cc Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Mon Dec 21 12:42:22 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Dec 21 12:39:06 CET 2009 - tgoettlicher(a)suse.de + +- fixed bnc #564321: Alt-P shortcut overloaded in YaST2 Software Management + +------------------------------------------------------------------- Fri Dec 4 16:59:59 CET 2009 - tgoettlicher(a)suse.de - Enabled multiple packages (fate# 305311) Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Mon Dec 21 12:42:22 2009 @@ -305,7 +305,7 @@ { _patternList = new YQPkgPatternList( parent, true ); YUI_CHECK_NEW( _patternList ); - _filters->addPage( _( "&Patterns" ), _patternList, "patterns" ); + _filters->addPage( _( "Patter&ns" ), _patternList, "patterns" ); connect( _patternList, SIGNAL( statusChanged() ), this, SLOT ( autoResolveDependencies() ) ); @@ -801,7 +801,7 @@ _extrasMenu = new QMenu( _menuBar ); YUI_CHECK_NEW( _extrasMenu ); action = _menuBar->addMenu( _extrasMenu ); - action->setText(_( "&Extras" )); + action->setText(_( "E&xtras" )); _extrasMenu->addAction( _( "Show &Products" ), this, SLOT( showProducts() ) ); _extrasMenu->addAction( _( "Show P&ackage Changes" ), this, SLOT( showAutoPkgList() ), Qt::CTRL + Qt::Key_A ); Modified: trunk/qt-pkg/src/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgSearchFilterView… ============================================================================== --- trunk/qt-pkg/src/YQPkgSearchFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgSearchFilterView.cc Mon Dec 21 12:42:22 2009 @@ -87,7 +87,7 @@ QVBoxLayout *vLayout = new QVBoxLayout; gbox->setLayout( vLayout ); - _searchInName = new QCheckBox( _( "&Name" ), gbox ); YUI_CHECK_NEW( _searchInName ); + _searchInName = new QCheckBox( _( "Nam&e" ), gbox ); YUI_CHECK_NEW( _searchInName ); vLayout->addWidget(_searchInName); _searchInKeywords = new QCheckBox( _( "&Keywords" ), gbox ); YUI_CHECK_NEW( _searchInKeywords ); vLayout->addWidget(_searchInKeywords); @@ -99,7 +99,7 @@ vLayout->addStretch(); // Intentionally NOT marking RPM tags for translation - _searchInProvides = new QCheckBox( "RPM \"&Provides\"" , gbox ); YUI_CHECK_NEW( _searchInProvides ); + _searchInProvides = new QCheckBox( "RPM \"P&rovides\"" , gbox ); YUI_CHECK_NEW( _searchInProvides ); vLayout->addWidget(_searchInProvides); _searchInRequires = new QCheckBox( "RPM \"Re&quires\"" , gbox ); YUI_CHECK_NEW( _searchInRequires ); vLayout->addWidget(_searchInRequires); -- 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] <web-client> master : add input help into network module
by Martin Schmidkunz 21 Dec '09

21 Dec '09

ref: refs/heads/master commit 38c6604c176cd4253071626b27dea7cf10120247 Author: Martin Schmidkunz <mschmidkunz(a)suse.de> Date: Mon Dec 21 16:39:27 2009 +0530 add input help into network module --- plugins/network/app/views/network/index.html.erb | 7 ++++++- webclient/public/stylesheets/style.css | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/network/app/views/network/index.html.erb b/plugins/network/app/views/network/index.html.erb index 3933d7f..4b2cfc0 100644 --- a/plugins/network/app/views/network/index.html.erb +++ b/plugins/network/app/views/network/index.html.erb @@ -34,10 +34,15 @@ <script type="text/javascript"> $(function() { - $('#nameservers').example(''); + $('#nameservers').example('IP adress of machine which translates hostnames in IP adresses'); }); </script> + <script type="text/javascript"> + $(function() { + $('#searchdomains').example('Domain name where hostname searching starts '); + }); + </script> <script type="text/javascript"> $(function() { diff --git a/webclient/public/stylesheets/style.css b/webclient/public/stylesheets/style.css index 4d541c7..2ec1b9f 100644 --- a/webclient/public/stylesheets/style.css +++ b/webclient/public/stylesheets/style.css @@ -64,10 +64,10 @@ input { color: #666; font-size: 1em; background: #fcfcfc; - width: 24em; + width: 32em; } input[type="text"] { - width: 24em; + width: 32em; } input:focus { border: 1px solid #69c; -- 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] <web-client> jr-yastmodel : fix collection name problem by hack
by Josef Reidinger 21 Dec '09

21 Dec '09

ref: refs/heads/jr-yastmodel commit d39e19b0d6921aca4f817372df1717c4c55a3485 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 21 11:07:43 2009 +0100 fix collection name problem by hack --- webclient/lib/yast_model/base.rb | 83 ++++++++++++++++++-------------- webclient/test/unit/yast_model_test.rb | 13 +++-- 2 files changed, 54 insertions(+), 42 deletions(-) diff --git a/webclient/lib/yast_model/base.rb b/webclient/lib/yast_model/base.rb index 6e640d5..98af103 100644 --- a/webclient/lib/yast_model/base.rb +++ b/webclient/lib/yast_model/base.rb @@ -1,46 +1,55 @@ module YastModel class Base < ActiveResource::Base + self.logger = Rails.logger #avoid problem with nil logger - def self.model_interface(i) - @@interface = i.to_sym - end + class << self + def model_interface(i) + @@interface = i.to_sym + end - def self.site - ret = super - if ret.nil? || ret != URI.parse(YaST::ServiceResource::Session.site) || - password != YaST::ServiceResource::Session.auth_token - set_site - end - return ret - end + alias_method :site_orig, :site + def site + ret = site_orig + if ret.nil? || ret != URI.parse(YaST::ServiceResource::Session.site) || + password != YaST::ServiceResource::Session.auth_token + set_site + end + return site_orig + end - def self.set_site - self.site = YaST::ServiceResource::Session.site - self.password = YaST::ServiceResource::Session.auth_token - Resource.site = "#{self.site}/" #resource has constant prefix to allow introspect -#FIXME not thread save - Rails.logger.debug "read interface to #{(a)interface.to_s}" - resource = Resource.find(:all).find { |r| r.interface.to_sym == @@interface.to_sym } -#TODO throw exception if not find - prefix, sep, collection_name = resource.href.rpartition('/') - prefix += '/' - prefix = Pathname.new prefix - end + def set_site + site = YaST::ServiceResource::Session.site + self.site = site + self.password = YaST::ServiceResource::Session.auth_token + YastModel::Resource.site = "#{site}/" #resource has constant prefix to allow introspect + #FIXME not thread save + Rails.logger.debug "read interface to #{@@interface.to_s}" + resource = YastModel::Resource.find(:all).find { |r| r.interface.to_sym == @@interface.to_sym } + #TODO throw exception if not find + p, sep, @@collection_name = resource.href.rpartition('/') + p += '/' + self.prefix = p + end -#fix ARs broken singleton - def self.find_one(options) - case from = options[:from] - when Symbol - instantiate_record(get(from, options[:params])) - when String - path = "#{from}#{query_string(options[:params])}" - instantiate_record(connection.get(path, headers)) - else - prefix_options, query_options = split_options(options[:params]) - path = collection_path(prefix_options, query_options) - instantiate_record( (connection.get(path, headers)), prefix_options ) - end - end +#redefine collection name as it is little broken see http://lists.opensuse.org/opensuse-ruby/2009-12/msg00008.html + def collection_name + @@collection_name + end + #fix ARs broken singleton + def find_one(options) + case from = options[:from] + when Symbol + instantiate_record(get(from, options[:params])) + when String + path = "#{from}#{query_string(options[:params])}" + instantiate_record(connection.get(path, headers)) + else + prefix_options, query_options = split_options(options[:params]) + path = self.collection_path(prefix_options, query_options) + instantiate_record( (connection.get(path, headers)), prefix_options ) + end + end + end end end diff --git a/webclient/test/unit/yast_model_test.rb b/webclient/test/unit/yast_model_test.rb index 03cb86f..d013678 100644 --- a/webclient/test/unit/yast_model_test.rb +++ b/webclient/test/unit/yast_model_test.rb @@ -8,8 +8,7 @@ PERMISSION_RESPONSE= <<EOF <permission> <granted type="boolean">true</granted> <id>org.opensuse.yast.modules.yapi.ntp.synchronize</id> - <:w - /permission> + </permission> </permissions> EOF @@ -41,16 +40,20 @@ def setup YaST::ServiceResource::Session.auth_token = "1234" end -class Test < YastModel::Base +class TestModel < YastModel::Base model_interface :'org.opensuse.yast.modules.test' end def test_model - assert Test.site.to_s.include?('localhost'), "site doesn't include localhost : #{Test.site}" + assert TestModel.site.to_s.include?('localhost'), "site doesn't include localhost : #{TestModel.site}" + puts YastModel::Base.collection_name + puts TestModel.collection_name + assert_equal "test",TestModel.collection_name + assert_equal "/",TestModel.prefix end def test_find - test = Test.find :one + test = TestModel.find :one assert "test",test.arg1 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] <web-client> master : Fixed footer content distance
by Martin Schmidkunz 21 Dec '09

21 Dec '09

ref: refs/heads/master commit aed00ccad996bfe1be2d99ad42d0c0afb7bf15f3 Author: Martin Schmidkunz <mschmidkunz(a)suse.de> Date: Mon Dec 21 13:21:13 2009 +0530 Fixed footer content distance --- .../app/views/administrator/index.html.erb | 65 +++++++++++++++++--- .../app/views/mail_settings/index.html.erb | 60 +++++++++++++++++- plugins/network/app/views/network/index.html.erb | 39 ++++++++++++ webclient/public/stylesheets/style.css | 10 +++- 4 files changed, 159 insertions(+), 15 deletions(-) diff --git a/plugins/administrator/app/views/administrator/index.html.erb b/plugins/administrator/app/views/administrator/index.html.erb index 07512bf..927ab13 100644 --- a/plugins/administrator/app/views/administrator/index.html.erb +++ b/plugins/administrator/app/views/administrator/index.html.erb @@ -8,6 +8,43 @@ label.error { display: none; color: red; padding-left: 11.5em; padding-bottom: 1em; text-align: left; vertical-align: top; width: 50% } </style> + <script type="text/javascript" charset="utf-8" src="/javascripts/jquery.example.js"></script> + + <script language="javascript"> + function changeBox() + { + document.getElementById('div1').style.display='none'; + document.getElementById('div2').style.display=''; + document.getElementById('password').focus(); + } + function restoreBox() + { + if(document.getElementById('password').value=='') + { + document.getElementById('div1').style.display=''; + document.getElementById('div2').style.display='none'; + } + } + </script> + + <script type="text/javascript"> + $(function() { + $('#administrator_password').example('Password'); + }); + </script> + + <script type="text/javascript"> + $(function() { + $('#administrator_confirm_password').example('Retype password'); + }); + </script> + + <script type="text/javascript"> + $(function() { + $('#administrator_aliases').example('Email adress to receive system mails'); + }); + </script> + <script type="text/javascript"> // define custom validation function // alias is actually a list of email aliases @@ -46,18 +83,28 @@ <% disabled = ! @permissions[:write] %> - <p> - <%= - _("Here, configure the settings for system administrator ('root').") - %> - </p> - <% form_for(:administrator, @administrator, :url => { :action => "update" }, :html => { :method => :put, :id => "adminForm", :onsubmit => "$('#progress').show()", :autocomplete => :off } ) do |f| %> <%= f.error_messages %> - <fieldset id="password"> + <fieldset class="grid_12" id="div1"> + <label><%=_("Password")%></label> + <input name="pass_temp" type="text" value="New password for system administrator ('root')" size="20" maxlength="20" onfocus="changeBox()" /> + </fieldset> + <fieldset class="grid_12" id="div2" style="display:none"> + <label><%=_("Password")%></label> + <input name="password" id="password" type="password" value="" size="20" maxlength="20" onBlur="restoreBox()" /> + </fieldset> + <fieldset class="grid_12" id="div1"> + <label><%=_("Confirm password")%></label> + <input name="pass_temp" type="text" value="Retype new password" size="20" maxlength="20" onfocus="changeBox()" /> + </fieldset> + <fieldset class="grid_12" id="div2" style="display:none"> + <label><%=_("Confirm password")%></label> + <input name="password" id="password" type="password" value="" size="20" maxlength="20" onBlur="restoreBox()" /> + </fieldset> + <fieldset class="grid_12" id="password"> <p><label><%=_("Password")%></label>  - <%= f.password_field :password, :disabled => disabled, :onkeyup => "if (password_validation_enabled) $('#adminForm').validate().element('#administrator_confirm_password');" %> + <%= f.password_field :password, :disabled => disabled, :onkeyup => "if (password_validation_enabled) $('#adminForm').validate().element('#administrator_confirm_password');", :onBlur=>"restoreBox()" %> </p> <p> <label><%=_("Confirm password")%></label> @@ -68,7 +115,7 @@ <p><label for="administrator_confirm_password" generated="true" class="error"></label><p> <p> <label><%=_("Forward mail to")%></label> - <%= f.text_field :aliases, :disabled => disabled, :class => "emails", :style => 'width: auto' %> + <%= f.text_field :aliases, :disabled => disabled, :class => "emails" %> <%= f.submit _("Save Mail"), :name => "save_aliases", :disabled => disabled, :onclick=>"return $('#adminForm').validate().element('#administrator_aliases');", :class=>'cancel' %> </p>  diff --git a/plugins/mail_settings/app/views/mail_settings/index.html.erb b/plugins/mail_settings/app/views/mail_settings/index.html.erb index b5f5200..953802b 100644 --- a/plugins/mail_settings/app/views/mail_settings/index.html.erb +++ b/plugins/mail_settings/app/views/mail_settings/index.html.erb @@ -5,6 +5,39 @@ label.error { float: none; color: red; padding-left: .5em; vertical-align: top; } </style> + + <script type="text/javascript" src="/javascripts/jquery.example.js"></script> + + <script type="text/javascript"> + $(function() { + $('#mail_settings_smtp_server').example('SMTP server adress'); + }); + </script> + + <script type="text/javascript"> + $(function() { + $('#mail_settings_user').example('User name for SMTP server login'); + }); + </script> + + <script language="javascript"> + function changeBox() + { + document.getElementById('div1').style.display='none'; + document.getElementById('div2').style.display=''; + document.getElementById('password').focus(); + } + function restoreBox() + { + if(document.getElementById('password').value=='') + { + document.getElementById('div1').style.display=''; + document.getElementById('div2').style.display='none'; + } + } + </script> + + <script type="text/javascript"> // define custom validation function for SMTP server validation jQuery.validator.addMethod("smtp_server", function(value, element) { @@ -46,14 +79,16 @@ <%= f.error_messages %> <fieldset class="grid_12"> <p> - <label for="<%= :smtp_server %>"><%=_("Outgoing mail server <br> (SMTP)")%></label> + <label for="<%= :smtp_server %>"><%=_("Outgoing mail server")%></label> <%=f.text_field :smtp_server, :disabled => disabled, :class => "smtp_server" %></p> <p> - <label><%=_("Transport Layer Security<br> (TLS)")%></label> - <%= f.select :transport_layer_security, [ [_("Disabled"), "NONE" ], [_("If available"), "MAY"], [_("Always"), "MUST"]], :disabled => disabled %></p> + <label><%=_("Use secure connection (TLS)")%></label> + <%= f.select :transport_layer_security, [ [_("Never"), "NONE" ], [_("If available"), "MAY"], [_("Always"), "MUST"]], :disabled => disabled %></p> <p> <label><%=_("User name")%></label> <%= f.text_field :user, :disabled => disabled %></p> + </fieldset> + <fieldset class="grid_12"> <p> <label><%=_("Password")%></label> <%= f.password_field :password, :disabled => disabled, :onkeyup => "if (password_validation_enabled) $('#mailForm').validate().element('#mail_settings_confirm_password')" %></p> @@ -61,9 +96,26 @@ <label><%=_("Confirm password")%></label> <%= f.password_field :confirm_password, :disabled => disabled, :equalTo => "#mail_settings_password" %> </p> - </fieldset> + </fieldset> + <fieldset class="grid_12" id="div1"> + <label><%=_("Password")%></label> + <input name="pass_temp" type="text" value="Password for SMTP server login" size="20" maxlength="20" onfocus="changeBox()" /> + </fieldset> + <fieldset class="grid_12" id="div2" style="display:none"> + <label><%=_("Password")%></label> + <input name="password" id="password" type="password" value="" size="20" maxlength="20" onBlur="restoreBox()" /> + </fieldset> + <fieldset class="grid_12" id="div1"> + <label><%=_("Confirm password")%></label> + <input name="pass_temp" type="text" value="Retype password for SMTP server login" size="20" maxlength="20" onfocus="changeBox()" /> + </fieldset> + <fieldset class="grid_12" id="div2" style="display:none"> + <label><%=_("Confirm password")%></label> + <input name="password" id="password" type="password" value="" size="20" maxlength="20" onBlur="restoreBox()" /> + </fieldset> <p> <%= form_send_buttons :onclick=>"password_validation_enabled = true", :disabled => disabled %> </p> <% end %> </div> + diff --git a/plugins/network/app/views/network/index.html.erb b/plugins/network/app/views/network/index.html.erb index c7fc8ec..3933d7f 100644 --- a/plugins/network/app/views/network/index.html.erb +++ b/plugins/network/app/views/network/index.html.erb @@ -6,6 +6,45 @@ <%= javascript_include_tag :defaults %> <link rel="stylesheet" href="/inc/smoothness/jquery.ui.custom.css" type="text/css" media="screen" title="default" charset="utf-8" /> + <script type="text/javascript" charset="utf-8" src="/javascripts/jquery.example.js"></script> + + <script type="text/javascript"> + $(function() { + $('#ip').example('Adress of this machine (e.g. 192.168.0.18)'); + }); + </script> + + <script type="text/javascript"> + $(function() { + $('#netmask').example('Adress shared with other machines (e.g. 255.255.255.0)'); + }); + </script> + + <script type="text/javascript"> + $(function() { + $('#name').example('Name of this machine in the network (e.g. mycomputer)'); + }); + </script> + + <script type="text/javascript"> + $(function() { + $('#domain').example('Network name (e.g. example.com)'); + }); + </script> + + <script type="text/javascript"> + $(function() { + $('#nameservers').example(''); + }); + </script> + + + <script type="text/javascript"> + $(function() { + $('#default_route').example('Target adress for outgoing IP data packages'); + }); + </script> + <% javascript_tag do -%> function disable_static_config(abool) { $("#ip")[0].disabled = abool; diff --git a/webclient/public/stylesheets/style.css b/webclient/public/stylesheets/style.css index a0a2138..4d541c7 100644 --- a/webclient/public/stylesheets/style.css +++ b/webclient/public/stylesheets/style.css @@ -64,9 +64,10 @@ input { color: #666; font-size: 1em; background: #fcfcfc; + width: 24em; } input[type="text"] { - width: 13em; + width: 24em; } input:focus { border: 1px solid #69c; @@ -122,7 +123,7 @@ ul li { } #content { - min-height: 600px; + margin-top: 2em; } #content h2 { @@ -629,6 +630,9 @@ input { margin: 1em; } +.example{ + font-style:italic; +} /* Error Messages */ @@ -644,3 +648,5 @@ input { float: left; margin-right: 0.3em; } + + -- 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 : handle exceptions in the helper script
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 3088bb251f7b0edfb384121ef012e15060a06c09 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Dec 18 17:28:07 2009 +0100 handle exceptions in the helper script --- plugins/patches/app/models/patch.rb | 3 +++ plugins/patches/scripts/list_patches.rb | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/plugins/patches/app/models/patch.rb b/plugins/patches/app/models/patch.rb index 638ecc4..adf9a3b 100644 --- a/plugins/patches/app/models/patch.rb +++ b/plugins/patches/app/models/patch.rb @@ -65,6 +65,9 @@ class Patch < Resolvable bs.progress = s['progress'] bs.subprogress = s['subprogress'] end + elsif received.has_key? 'error' + return PackageKitError.new(received['error']['description']) if received['error']['type'] == 'PACKAGEKIT_ERROR' + return BackendException.new(received['error']['description']) end end rescue Exception => e diff --git a/plugins/patches/scripts/list_patches.rb b/plugins/patches/scripts/list_patches.rb index e1d692c..636613a 100644 --- a/plugins/patches/scripts/list_patches.rb +++ b/plugins/patches/scripts/list_patches.rb @@ -14,8 +14,8 @@ class ProgressPrinter # this is the callback method def update(progress) - # print the progress in XML format - puts progress.to_xml + # print the progress in XML format on single line + puts progress.to_xml.gsub("\n", '') # print it immediately, flush the output buffer $stdout.flush @@ -29,6 +29,13 @@ ProgressPrinter.new(bs) what = ARGV[0] || :available -patches = Patch.do_find(what, bs) - -puts patches.to_xml(:root => "patches", :dasherize => false).gsub!("\n", '') +begin + patches = Patch.do_find(what, bs) + puts patches.to_xml(:root => "patches", :dasherize => false).gsub("\n", '') +rescue Exception => e + if e.respond_to? :to_xml + puts e.to_xml.gsub("\n", '') + else + puts BackendException.new(e.message).to_xml.gsub("\n", '') + end +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] r60154 - in /trunk/autoinstallation: VERSION package/autoyast2.changes
by aschnell＠svn.opensuse.org 18 Dec '09

18 Dec '09

Author: aschnell Date: Fri Dec 18 16:21:44 2009 New Revision: 60154 URL: http://svn.opensuse.org/viewcvs/yast?rev=60154&view=rev Log: - increase version Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=601… ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Fri Dec 18 16:21:44 2009 @@ -1 +1 @@ -2.18.14 +2.19.0 Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Fri Dec 18 16:21:44 2009 @@ -2,6 +2,7 @@ Wed Dec 16 18:44:20 CET 2009 - aschnell(a)suse.de - adapted encryption password setting to new yast2-storage +- 2.19.0 ------------------------------------------------------------------- Wed Nov 25 15:55:10 CET 2009 - ug(a)suse.de -- 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] r60153 - /tags/stable-2_19_0/core/
by aschnell＠svn.opensuse.org 18 Dec '09

18 Dec '09

Author: aschnell Date: Fri Dec 18 16:14:46 2009 New Revision: 60153 URL: http://svn.opensuse.org/viewcvs/yast?rev=60153&view=rev Log: Created tag stable-2_19_0 for core Added: tags/stable-2_19_0/core/ (props changed) - copied from r60152, trunk/core/ -- 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] <web-client> master : code cleanup
by Stefan Schubert 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 53d87d86f58d584f457597d7bdd2bd772ee7e9f1 Author: Stefan Schubert <schubi(a)suse.de> Date: Fri Dec 18 16:04:00 2009 +0100 code cleanup --- .../app/controllers/patch_updates_controller.rb | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/plugins/patch_updates/app/controllers/patch_updates_controller.rb b/plugins/patch_updates/app/controllers/patch_updates_controller.rb index db14fb3..2c42bf9 100644 --- a/plugins/patch_updates/app/controllers/patch_updates_controller.rb +++ b/plugins/patch_updates/app/controllers/patch_updates_controller.rb @@ -16,16 +16,15 @@ class PatchUpdatesController < ApplicationController begin @patch_updates = load_proxy 'org.opensuse.yast.system.patches', :all rescue ActiveResource::ServerError => e - error_hash = Hash.from_xml e.response.body - logger.warn error_hash.inspect - if error_hash["error"] && error_hash["error"]["type"] == "PACKAGEKIT_ERROR" - flash[:error] = error_hash["error"]["description"] + ce = ClientException.new e + if ce.backend_exception_type == "PACKAGEKIT_ERROR" + flash[:error] = ce.message @patch_updates = [] @error = true else raise e end - end + end logger.debug "Available patches: #{(a)patch_updates.inspect}" end @@ -40,14 +39,9 @@ class PatchUpdatesController < ApplicationController patch_updates = nil error_string = _("A problem occured when loading patch information.") rescue ActiveResource::ServerError => e - error_hash = Hash.from_xml e.response.body - logger.warn error_hash.inspect - if error_hash["error"] && error_hash["error"]["type"] == "PACKAGEKIT_ERROR" - error_string = error_hash["error"]["description"] - else - error_string = _("A problem occured when loading patch information.") - end error = ClientException.new(e) + error_string = _("A problem occured when loading patch information.") + error_string = error.message if error.backend_exception_type == "PACKAGEKIT_ERROR" patch_updates = nil end patches_summary = nil -- 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] <web-client> backgroud_patches_bnc550934 : code cleanup
by Stefan Schubert 18 Dec '09

18 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit 53d87d86f58d584f457597d7bdd2bd772ee7e9f1 Author: Stefan Schubert <schubi(a)suse.de> Date: Fri Dec 18 16:04:00 2009 +0100 code cleanup --- .../app/controllers/patch_updates_controller.rb | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/plugins/patch_updates/app/controllers/patch_updates_controller.rb b/plugins/patch_updates/app/controllers/patch_updates_controller.rb index db14fb3..2c42bf9 100644 --- a/plugins/patch_updates/app/controllers/patch_updates_controller.rb +++ b/plugins/patch_updates/app/controllers/patch_updates_controller.rb @@ -16,16 +16,15 @@ class PatchUpdatesController < ApplicationController begin @patch_updates = load_proxy 'org.opensuse.yast.system.patches', :all rescue ActiveResource::ServerError => e - error_hash = Hash.from_xml e.response.body - logger.warn error_hash.inspect - if error_hash["error"] && error_hash["error"]["type"] == "PACKAGEKIT_ERROR" - flash[:error] = error_hash["error"]["description"] + ce = ClientException.new e + if ce.backend_exception_type == "PACKAGEKIT_ERROR" + flash[:error] = ce.message @patch_updates = [] @error = true else raise e end - end + end logger.debug "Available patches: #{(a)patch_updates.inspect}" end @@ -40,14 +39,9 @@ class PatchUpdatesController < ApplicationController patch_updates = nil error_string = _("A problem occured when loading patch information.") rescue ActiveResource::ServerError => e - error_hash = Hash.from_xml e.response.body - logger.warn error_hash.inspect - if error_hash["error"] && error_hash["error"]["type"] == "PACKAGEKIT_ERROR" - error_string = error_hash["error"]["description"] - else - error_string = _("A problem occured when loading patch information.") - end error = ClientException.new(e) + error_string = _("A problem occured when loading patch information.") + error_string = error.message if error.backend_exception_type == "PACKAGEKIT_ERROR" patch_updates = nil end patches_summary = nil -- 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 : do not raise PackageKit exception inside a DBus signal handler
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit cde1b8ff40f87a9f3021de7a75878c42461962d1 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Dec 18 15:03:44 2009 +0100 do not raise PackageKit exception inside a DBus signal handler it hangs the service (bnc#565930) --- plugins/patches/app/models/resolvable.rb | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/patches/app/models/resolvable.rb b/plugins/patches/app/models/resolvable.rb index 0e6c2aa..e2cd769 100644 --- a/plugins/patches/app/models/resolvable.rb +++ b/plugins/patches/app/models/resolvable.rb @@ -141,18 +141,20 @@ public proxy = transaction_iface.object + error = nil + proxy.on_signal(signal.to_s, &block) proxy.on_signal("ErrorCode") {|u1,u2| error_string = "#{u1}: #{u2}" Rails.logger.error error_string - dbusloop.quit - raise PackageKitError.new(error_string) + dbusloop.quit + error = PackageKitError.new(error_string) } proxy.on_signal("RepoSignatureRequired") {|u1,u2,u3,u4,u5,u6,u7,u8| error_string = "Repository #{u2} needs to be signed" Rails.logger.error error_string - dbusloop.quit - raise PackageKitError.new(error_string) + dbusloop.quit + error = PackageKitError.new(error_string) } proxy.on_signal("Finished") {|u1,u2| dbusloop.quit } # Do the call only when all signal handlers are in place, @@ -178,6 +180,9 @@ public dbusloop.run packagekit_iface.SuggestDaemonQuit + + raise error if error + rescue DBus::Error => dbus_error # check if it is a known error raise ServiceNotAvailable.new('PackageKit') if dbus_error.message =~ /org.freedesktop.DBus.Error.ServiceUnknown/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0