Hello community, here is the log from the commit of package webyast-users-ws for openSUSE:Factory checked in at Fri Feb 11 01:31:16 CET 2011. -------- --- webyast-users-ws/webyast-users-ws.changes 2010-08-23 16:45:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/webyast-users-ws/webyast-users-ws.changes 2011-02-09 10:07:55.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Feb 9 09:05:58 UTC 2011 - schubi@novell.com + +- webyast-users-ws-rpmlintrc removed +- 0.2.2 + +------------------------------------------------------------------- +Fri Nov 26 10:14:36 CET 2010 - mzugec@suse.cz + +- accept system users (bnc#638476) +- 0.2.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- webyast-users-ws-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webyast-users-ws.spec ++++++ --- /var/tmp/diff_new_pack.lD2HAf/_old 2011-02-11 01:31:10.000000000 +0100 +++ /var/tmp/diff_new_pack.lD2HAf/_new 2011-02-11 01:31:10.000000000 +0100 @@ -27,7 +27,7 @@ Group: Productivity/Networking/Web/Utilities Url: http://en.opensuse.org/Portal:WebYaST AutoReqProv: on -Version: 0.2.0 +Version: 0.2.2 Release: 1 Summary: WebYaST - users management Source: www.tar.bz2 ++++++ www.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/getent_passwd.rb new/www/app/models/getent_passwd.rb --- old/www/app/models/getent_passwd.rb 2010-08-19 13:15:54.000000000 +0200 +++ new/www/app/models/getent_passwd.rb 2011-02-01 10:49:25.000000000 +0100 @@ -28,7 +28,7 @@ result = [] res = pure_getent raise "cannot obtain passwd" unless res - minimum = system_minimum + minimum = system_minimum # RORSCAN_ITL minimum = 1000 if minimum == 0 #fallback lines = res.split "\n" lines.each do |l| @@ -51,14 +51,14 @@ private def self.system_minimum - (`cat /etc/login.defs | grep '^UID_MIN' | sed 's/^UID_MIN[^0-9]*\\([0-9]\\+\\).*$/\\1/'`).to_i + (`cat /etc/login.defs | grep '^UID_MIN' | sed 's/^UID_MIN[^0-9]*\\([0-9]\\+\\).*$/\\1/'`).to_i # RORSCAN_ITL end def self.pure_getent - `getent passwd` + `getent passwd` # RORSCAN_ITL end def self.pure_wbinfo - `which wbinfo >/dev/null && wbinfo -u --domain .` + `which wbinfo >/dev/null && wbinfo -u --domain .` # RORSCAN_ITL end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/group.rb new/www/app/models/group.rb --- old/www/app/models/group.rb 2010-07-15 10:31:45.000000000 +0200 +++ new/www/app/models/group.rb 2011-02-01 10:49:25.000000000 +0100 @@ -28,7 +28,7 @@ attr_accessor :old_cn # for group identification when changing group name attr_accessor :default_members # list of user names, which have this group as default attr_accessor :members # list of users explicitaly added into this group - attr_accessor :group_type # type of the group ... system or local + attr_accessor :group_type # type of the group ... system or local # RORSCAN_ITL attr_accessible :cn, :old_cn, :gid, :default_members, :members, :group_type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/user.rb new/www/app/models/user.rb --- old/www/app/models/user.rb 2010-07-15 10:31:45.000000000 +0200 +++ new/www/app/models/user.rb 2011-02-01 10:49:11.000000000 +0100 @@ -52,7 +52,8 @@ # how to index hash with users "index" => ["s", "uid"], # attributes to return for each user - "user_attributes" => [ "as", attributes ] + "user_attributes" => [ "as", attributes ], + "type" => params["type"]||="local" } users_map = YastService.Call("YaPI::USERS::UsersGet", parameters) if users_map.nil? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/test/unit/user_test.rb new/www/test/unit/user_test.rb --- old/www/test/unit/user_test.rb 2010-07-15 10:31:45.000000000 +0200 +++ new/www/test/unit/user_test.rb 2010-12-13 11:21:27.000000000 +0100 @@ -22,28 +22,26 @@ require File.expand_path(File.dirname(__FILE__) + "/../test_helper") require 'test/unit' require "yast_service" -require 'mocha' -require 'pp' +#require 'mocha' +#require 'pp' class UserTest < Test::Unit::TestCase def setup - parameters = { "index" => ["s", "uid"], "user_attributes" => - [ "as", [ "cn", "uidNumber", "homeDirectory", - "grouplist", "uid", "loginShell", "groupname" ] ] - } - YastService.stubs(:Call).with("YaPI::USERS::UsersGet", parameters).returns({"testuser1"=>{"cn"=>"testuser1", "groupname"=>"users", "uidNumber"=>1000, "homeDirectory"=>"/home/testuser1"}, - "testuser2"=>{"cn"=>"testuser2", "groupname"=>"users", "uidNumber"=>1010, "homeDirectory"=>"/home/testuser1"}}) - - short_parameters = { - "index" => ["s", "uid"], - "user_attributes" => [ "as", [ "uid", "cn"]] - } - YastService.stubs(:Call).with("YaPI::USERS::UsersGet", short_parameters).returns({ + parameters = {'user_attributes' => ['as', ['cn', 'uidNumber', 'homeDirectory', + 'grouplist', 'uid', 'loginShell', 'groupname']], 'type' => 'local', 'index' => ['s', 'uid']} + result = {"testuser1"=>{"cn"=>"testuser1", "groupname"=>"users", "uidNumber"=>1000, "homeDirectory"=>"/home/testuser1"}, + "testuser2"=>{"cn"=>"testuser2", "groupname"=>"users", "uidNumber"=>1010, "homeDirectory"=>"/home/testuser1"}} + + YastService.stubs(:Call).with("YaPI::USERS::UsersGet", parameters).returns(result) + + short_parameters = {'user_attributes' => ['as', ['uid', 'cn']], + 'type' => 'local', 'index' => ['s', 'uid']} + short_result = { "testuser1"=>{"cn"=>"testuser1", "uid" => "testuser1"}, "testuser2"=>{"cn"=>"Test user2", "uid" => "testuser2"}} - ) + YastService.stubs(:Call).with("YaPI::USERS::UsersGet", short_parameters).returns(short_result) end def test_user ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org