ref: refs/heads/master commit 25165997f0f039846a8bb4c250aab840f049ca4d Author: Stefan Schubert Date: Tue Aug 11 14:43:34 2009 +0200 improved logging --- .../app/controllers/permissions_controller.rb | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/webservice/app/controllers/permissions_controller.rb b/webservice/app/controllers/permissions_controller.rb index bd40e83..63389e8 100644 --- a/webservice/app/controllers/permissions_controller.rb +++ b/webservice/app/controllers/permissions_controller.rb @@ -25,13 +25,18 @@ class PermissionsController < ApplicationController suse_string = /org\.opensuse\.yast\..*/ # get users or all actions - ret = if user_id - Scr.instance.execute(["polkit-auth", "--user", user_id, "--explicit"]) - else - Scr.instance.execute(["polkit-action"]) - end rescue nil - raise RuntimeError unless ret && ret[:exit] == 0 + begin + ret = if user_id + Scr.instance.execute(["polkit-auth", "--user", user_id, "--explicit"]) + else + Scr.instance.execute(["polkit-action"]) + end + rescue Exception => e + ret = nil + logger.error "SCR.execute has raised the exception: #{e.inspect}" + end + raise RuntimeError unless ret && ret[:exit] == 0 ret[:stdout].scan(suse_string) do |p| next unless filter.blank? or p.include?(filter) yield p -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org