YaST Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
February 2014
- 12 participants
- 843 discussions
Script 'mail_helper' called by ro
Hello packager,
This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: ro.
Here comes the log...
---------------------------%<------------------------------
Hi,
here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-theme -> sle12
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-theme/yast2-theme.changes 2014-02-11 18:24:14.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-theme/yast2-theme.changes 2014-02-14 10:13:03.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Feb 13 18:03:49 UTC 2014 - lslezak(a)suse.cz
+
+- updated package selector style (by Ken Wimer)
+- 3.1.5
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- branding-SLED
- branding-SLES
- yast2-theme
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-theme (Old)
and /mounts/work_src_done/SLE12/yast2-theme (BS:build ID:32728 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-theme", Maintainer is "yast-commit(a)opensuse.org"
Old:
----
yast2-theme-3.1.4.tar.bz2
New:
----
yast2-theme-3.1.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-theme.spec ++++++
--- /var/tmp/diff_new_pack.P1VK0U/_old 2014-02-14 14:02:18.000000000 +0100
+++ /var/tmp/diff_new_pack.P1VK0U/_new 2014-02-14 14:02:18.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-theme
-Version: 3.1.4
+Version: 3.1.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-theme-3.1.4.tar.bz2 -> yast2-theme-3.1.5.tar.bz2 ++++++
/work/SRC/SUSE:SLE-12:GA/yast2-theme/yast2-theme-3.1.4.tar.bz2 /mounts/work_src_done/SLE12/yast2-theme/yast2-theme-3.1.5.tar.bz2 differ: char 11, line 1
continue with "q"...
Checked in at Fri Feb 14 14:02:27 CET 2014 by ro
Remember to have fun...
--
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] Request 32722 changed to accepted (submit SUSE:SLE-12:GA/yast2-services-manager)
by Ruediger Oertel 14 Feb '14
by Ruediger Oertel 14 Feb '14
14 Feb '14
Visit https://build.suse.de/request/show/32722
State of request 32722 was changed by oertel:
new -> accepted
Comment:
Accepted submit request 32722 from user leonardocf
Actions:
- submit Devel:YaST:Head/yast2-services-manager => SUSE:SLE-12:GA/yast2-services-manager
--
Configure notifications at https://build.suse.de/user/notifications
SUSE Internal OBS Instance (https://build.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
Script 'mail_helper' called by ro
Hello packager,
This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: ro.
Here comes the log...
---------------------------%<------------------------------
Hi,
here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-services-manager -> sle12
## BNC# 861529 : "Warning when creating partitioning proposal - default_target_proposal.rb:18: warning:" (NEW/)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-services-manager/yast2-services-manager.changes 2014-02-12 15:19:30.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-services-manager/yast2-services-manager.changes 2014-02-14 09:33:26.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Feb 13 16:11:53 UTC 2014 - jreidinger(a)suse.com
+
+- avoid constant redefine warning (BNC#861529)
+- 3.1.2
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-services-manager
- at least 17 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-services-manager (Old)
and /mounts/work_src_done/SLE12/yast2-services-manager (BS:build ID:32722 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-services-manager", Maintainer is "yast-commit(a)opensuse.org"
Old:
----
yast2-services-manager-3.1.1.tar.bz2
New:
----
yast2-services-manager-3.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-services-manager.spec ++++++
--- /var/tmp/diff_new_pack.shw9kv/_old 2014-02-14 14:02:05.000000000 +0100
+++ /var/tmp/diff_new_pack.shw9kv/_new 2014-02-14 14:02:05.000000000 +0100
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 3.1.1
+Version: 3.1.2
Release: 0
BuildArch: noarch
++++++ yast2-services-manager-3.1.1.tar.bz2 -> yast2-services-manager-3.1.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.1/package/yast2-services-manager.changes new/yast2-services-manager-3.1.2/package/yast2-services-manager.changes
--- old/yast2-services-manager-3.1.1/package/yast2-services-manager.changes 2014-02-12 12:52:45.000000000 +0100
+++ new/yast2-services-manager-3.1.2/package/yast2-services-manager.changes 2014-02-14 09:30:24.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Feb 13 16:11:53 UTC 2014 - jreidinger(a)suse.com
+
+- avoid constant redefine warning (BNC#861529)
+- 3.1.2
+
+-------------------------------------------------------------------
Wed Feb 12 11:27:58 UTC 2014 - jreidinger(a)suse.com
- fix namespace collision for minimal installation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.1/package/yast2-services-manager.spec new/yast2-services-manager-3.1.2/package/yast2-services-manager.spec
--- old/yast2-services-manager-3.1.1/package/yast2-services-manager.spec 2014-02-12 12:52:45.000000000 +0100
+++ new/yast2-services-manager-3.1.2/package/yast2-services-manager.spec 2014-02-14 09:30:24.000000000 +0100
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 3.1.1
+Version: 3.1.2
Release: 0
BuildArch: noarch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.1/src/clients/default_target_proposal.rb new/yast2-services-manager-3.1.2/src/clients/default_target_proposal.rb
--- old/yast2-services-manager-3.1.1/src/clients/default_target_proposal.rb 2014-02-12 12:52:45.000000000 +0100
+++ new/yast2-services-manager-3.1.2/src/clients/default_target_proposal.rb 2014-02-14 09:30:24.000000000 +0100
@@ -205,6 +205,9 @@
end
end
- end
+ # clients are always re-evaluated, so avoid redefine of class otherwise
+ # constant redefine warning happen
+ end unless defined? :TargetProposal
+
TargetProposal.new.call(WFM.Args)
end
continue with "q"...
Checked in at Fri Feb 14 14:02:14 CET 2014 by ro
Remember to have fun...
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
Script 'mail_helper' called by ro
Hello packager,
This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: ro.
Here comes the log...
---------------------------%<------------------------------
Hi,
here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-ruby-bindings -> sle12
## BNC# 861529 : "Warning when creating partitioning proposal - default_target_proposal.rb:18: warning:" (NEW/)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-ruby-bindings/yast2-ruby-bindings.changes 2014-02-05 17:48:45.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-ruby-bindings/yast2-ruby-bindings.changes 2014-02-13 17:08:32.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Feb 10 13:43:23 UTC 2014 - jreidinger(a)suse.com
+
+- Do not unload clients after execution (BNC#861529)
+- 3.1.9
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-ruby-bindings
- at least 75 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-ruby-bindings (Old)
and /mounts/work_src_done/SLE12/yast2-ruby-bindings (BS:build ID:32647 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ruby-bindings", Maintainer is "yast-commit(a)opensuse.org"
Old:
----
yast2-ruby-bindings-3.1.8.tar.bz2
New:
----
yast2-ruby-bindings-3.1.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ruby-bindings.spec ++++++
--- /var/tmp/diff_new_pack.098RQF/_old 2014-02-14 14:01:53.000000000 +0100
+++ /var/tmp/diff_new_pack.098RQF/_new 2014-02-14 14:01:53.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-ruby-bindings
-Version: 3.1.8
+Version: 3.1.9
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-ruby-bindings-%{version}.tar.bz2
++++++ yast2-ruby-bindings-3.1.8.tar.bz2 -> yast2-ruby-bindings-3.1.9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.8/package/yast2-ruby-bindings.changes new/yast2-ruby-bindings-3.1.9/package/yast2-ruby-bindings.changes
--- old/yast2-ruby-bindings-3.1.8/package/yast2-ruby-bindings.changes 2014-02-05 15:40:42.000000000 +0100
+++ new/yast2-ruby-bindings-3.1.9/package/yast2-ruby-bindings.changes 2014-02-13 17:05:21.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Feb 10 13:43:23 UTC 2014 - jreidinger(a)suse.com
+
+- Do not unload clients after execution (BNC#861529)
+- 3.1.9
+
+-------------------------------------------------------------------
Wed Feb 5 14:20:37 UTC 2014 - lslezak(a)suse.cz
- Builtins.y2milestone(),... marked as deprecated, use Yast::Logger
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.8/package/yast2-ruby-bindings.spec new/yast2-ruby-bindings-3.1.9/package/yast2-ruby-bindings.spec
--- old/yast2-ruby-bindings-3.1.8/package/yast2-ruby-bindings.spec 2014-02-05 15:40:42.000000000 +0100
+++ new/yast2-ruby-bindings-3.1.9/package/yast2-ruby-bindings.spec 2014-02-13 17:05:21.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-ruby-bindings
-Version: 3.1.8
+Version: 3.1.9
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-ruby-bindings-%{version}.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.8/src/binary/Builtin.cc new/yast2-ruby-bindings-3.1.9/src/binary/Builtin.cc
--- old/yast2-ruby-bindings-3.1.8/src/binary/Builtin.cc 2014-02-05 15:40:42.000000000 +0100
+++ new/yast2-ruby-bindings-3.1.9/src/binary/Builtin.cc 2014-02-13 17:05:21.000000000 +0100
@@ -31,7 +31,6 @@
#include "Y2YCPTypeConv.h"
#include "Y2RubyTypeConv.h"
#include "RubyLogger.h"
-#include "YRuby.h"
#include "Y2RubyUtils.h"
static VALUE rb_mSCR;
@@ -49,7 +48,6 @@
static VALUE call_builtin(const string &qualified_name, int argc, VALUE *argv)
{
- YRuby::yRuby();
extern StaticDeclaration static_declarations;
YaST::ee.setFilename(RSTRING_PTR(argv[0]));
YaST::ee.setLinenumber(FIX2INT(argv[1]));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.8/src/ruby/yast/wfm.rb new/yast2-ruby-bindings-3.1.9/src/ruby/yast/wfm.rb
--- old/yast2-ruby-bindings-3.1.8/src/ruby/yast/wfm.rb 2014-02-05 15:40:42.000000000 +0100
+++ new/yast2-ruby-bindings-3.1.9/src/ruby/yast/wfm.rb 2014-02-13 17:05:21.000000000 +0100
@@ -207,21 +207,6 @@
)
end
return false
- ensure
- # unload the client class to ensure that the includes will be
- # fully initialized when running it next time
- # (Yast.include skips initialize_<include> calls when the include
- # module is already present in the target class)
- client_without_suffix = File.basename(client).sub(/\.rb$/, "")
- client_name = (client_without_suffix.
- gsub(/^./) { |s| s.upcase }.
- gsub(/[-_.]./) { |s| s[1].upcase } +
- "Client").to_sym
-
- if Yast.constants.include?(client_name)
- Yast.y2debug "Unloading client class #{client_name}"
- Yast.send(:remove_const, client_name)
- end
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.8/src/ruby/yast/yast.rb new/yast2-ruby-bindings-3.1.9/src/ruby/yast/yast.rb
--- old/yast2-ruby-bindings-3.1.8/src/ruby/yast/yast.rb 2014-02-05 15:40:42.000000000 +0100
+++ new/yast2-ruby-bindings-3.1.9/src/ruby/yast/yast.rb 2014-02-13 17:05:21.000000000 +0100
@@ -111,13 +111,27 @@
mod = Yast.const_get module_name
- return if target.class.include? mod
-
- target.class.send(:include, mod)
-
- method_name = "initialize_" + path_without_suffix.gsub(/[-.\/]/, "_")
-
- target.send method_name.to_sym, target if target.respond_to? method_name.to_sym
+ # if never included, then include
+ if !target.class.include? mod
+ target.class.send(:include, mod)
+ end
+
+ encoded_name = path_without_suffix.gsub(/[-.\/]/, "_")
+ initialized_variable = "@" + encoded_name + "initialized"
+ method_name = "initialize_" + encoded_name
+
+ # tricky condition. Here collide two yast features that had old ycp
+ # 1) in clients reapeated call results in new client object, but client base class
+ # is already defined, so not needed to include again, but it's
+ # needed to be reinitialized, so we need to call initialization method
+ # even if module is already included
+ # 2) if there is multi include, then only first one must call initialization
+ # because other calls are ignored
+ if target.respond_to?(method_name.to_sym) &&
+ !target.instance_variable_defined?(initialized_variable)
+ target.send(method_name.to_sym, target)
+ target.instance_variable_set(initialized_variable, true)
+ end
end
# imports component module with given name and create wrapper for it.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.8/tests/ruby/import_test.rb new/yast2-ruby-bindings-3.1.9/tests/ruby/import_test.rb
--- old/yast2-ruby-bindings-3.1.8/tests/ruby/import_test.rb 2014-02-05 15:40:42.000000000 +0100
+++ new/yast2-ruby-bindings-3.1.9/tests/ruby/import_test.rb 2014-02-13 17:05:21.000000000 +0100
@@ -7,11 +7,6 @@
require "yast"
class YcpImportTest < Yast::TestCase
- def setup
- module_path = File.expand_path("../modules",__FILE__)+'/'
- Yast.add_module_path module_path
- end
-
def test_import
Yast.import( "ExampleTestModule" )
assert Yast::ExampleTestModule.respond_to?(:sparc_map)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.8/tests/ruby/include/example.rb new/yast2-ruby-bindings-3.1.9/tests/ruby/include/example.rb
--- old/yast2-ruby-bindings-3.1.8/tests/ruby/include/example.rb 2014-02-05 15:40:42.000000000 +0100
+++ new/yast2-ruby-bindings-3.1.9/tests/ruby/include/example.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-module Yast
- module ExampleInclude
- def initialize_example target
- @test = 15
- end
-
- def test_plus_five
- @test + 5
- end
- end
-end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.8/tests/ruby/include_test.rb new/yast2-ruby-bindings-3.1.9/tests/ruby/include_test.rb
--- old/yast2-ruby-bindings-3.1.8/tests/ruby/include_test.rb 2014-02-05 15:40:42.000000000 +0100
+++ new/yast2-ruby-bindings-3.1.9/tests/ruby/include_test.rb 2014-02-13 17:05:21.000000000 +0100
@@ -19,7 +19,7 @@
class DoubleIncludeTest < Module
def initialize
- YCP.include self, "example.rb"
+ Yast.include self, "example.rb"
@test = 5
# second include should not call again init, so @test is kept to 5
Yast.include self, "example.rb"
@@ -27,16 +27,11 @@
attr_reader :test
end
- DIT = IncludeTest.new
+ DIT = DoubleIncludeTest.new
end
class IncludeTest < Yast::TestCase
- def setup
- include_path = File.expand_path("../include",__FILE__)+'/'
- Yast.add_include_path include_path
- end
-
def test_include
assert_equal 15, Yast::IT.test
end
Files old/yast2-ruby-bindings-3.1.8/tests/ruby/modules/ExampleTestModule.ybc and new/yast2-ruby-bindings-3.1.9/tests/ruby/modules/ExampleTestModule.ybc differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.8/tests/ruby/modules/ExampleTestModule.ycp new/yast2-ruby-bindings-3.1.9/tests/ruby/modules/ExampleTestModule.ycp
--- old/yast2-ruby-bindings-3.1.8/tests/ruby/modules/ExampleTestModule.ycp 2014-02-05 15:40:42.000000000 +0100
+++ new/yast2-ruby-bindings-3.1.9/tests/ruby/modules/ExampleTestModule.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-//WARNING compile after each change!
-{
- module "ExampleTestModule";
-
- global string example_string = "x86_64";
-
- global map<string,integer> sparc_map() {
- return $["one": 1, "two": 2];
- }
-
- global boolean is_xen() {
- return false;
- }
-
- global string arch_short() {
- return "ZX Spectrum";
- }
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.8/tests/ruby/ops.ycp new/yast2-ruby-bindings-3.1.9/tests/ruby/ops.ycp
--- old/yast2-ruby-bindings-3.1.8/tests/ruby/ops.ycp 2014-02-05 15:40:42.000000000 +0100
+++ new/yast2-ruby-bindings-3.1.9/tests/ruby/ops.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,116 +0,0 @@
-{
- y2milestone ("nil same: %1", nil == nil);
- y2milestone ("integers same: %1", 1 == 1);
- y2milestone ("floats same: %1", 1.1 == 1.1);
- y2milestone ("strings same: %1", "s" == "s");
- y2milestone ("symbols same: %1", `s == `s);
- y2milestone ("booleans same: %1", false == false);
- y2milestone ("lists same: %1", [1] == [1]);
- y2milestone ("maps same: %1", $[1:2] == $[1:2]);
- y2milestone ("paths same: %1", .etc == .etc);
- y2milestone ("terms same: %1", `a(`b) == `a(`b));
-
- y2milestone ("nil differ: %1", nil != nil);
- y2milestone ("integers differ: %1", 1 != 1);
- y2milestone ("floats differ: %1", 1.1 != 1.1);
- y2milestone ("strings differ: %1", "s" != "s");
- y2milestone ("symbols differ: %1", `s != `s);
- y2milestone ("booleans differ: %1", false != false);
- y2milestone ("lists differ: %1", [1] != [1]);
- y2milestone ("maps differ: %1", $[1:2] != $[1:2]);
- y2milestone ("paths differ: %1", .etc != .etc);
- y2milestone ("terms differ: %1", `a(`b) != `a(`b));
-
- y2milestone ("integers not same: %1", 1 == 2);
- y2milestone ("floats not same: %1", 1.1 == 1.2);
- y2milestone ("strings not same: %1", "s" == "st");
- y2milestone ("symbols not same: %1", `s == `st);
- y2milestone ("booleans not same: %1", false == true);
- y2milestone ("lists not same: %1", [1] == [1,2]);
- y2milestone ("maps not same: %1", $[1:2] == $[1:2, 2:3]);
- y2milestone ("paths not same: %1", .etc == .);
- y2milestone ("terms not same: %1", `a(`b) == `a());
-
- y2milestone ("integers not differ: %1", 1 != 2);
- y2milestone ("floats not differ: %1", 1.1 != 1.2);
- y2milestone ("strings not differ: %1", "s" != "st");
- y2milestone ("symbols not differ: %1", `s != `st);
- y2milestone ("booleans not differ: %1", false != true);
- y2milestone ("lists not differ: %1", [1] != [1,2]);
- y2milestone ("maps not differ: %1", $[1:2] != $[1:2, 2:3]);
- y2milestone ("paths not differ: %1", .etc != .);
- y2milestone ("terms not differ: %1", `a(`b) != `a());
-
- y2milestone ("integer x nil compare: %1", 1 == nil);
- y2milestone ("nil x compare compare: %1", nil == 1);
- y2milestone ("integer x nil not_equal: %1", 1 != nil);
- y2milestone ("nil x compare not_equal: %1", nil != 1);
-
-// only same type can be compared, exception is nil as seen above
-// y2milestone ("integer x string compare: %1", 1 == "1");
-
-//comparison
- y2milestone ("integers bigger: %1", 1 < 2);
- y2milestone ("integer nil bigger: %1", 1 < nil);
- y2milestone ("integer nil bigger equal: %1", 1 <= nil);
- y2milestone ("integer nil lesser: %1", 1 > nil);
- y2milestone ("integer nil lesser equal: %1", 1 >= nil);
- y2milestone ("nil integer bigger: %1", nil < 1);
- y2milestone ("nil integer bigger equal: %1", nil <= 1);
- y2milestone ("nil integer lesser: %1", nil > 1);
- y2milestone ("nil integer lesser equal: %1", nil >= 1);
-
- y2milestone ("string bigger: %1", "s" < "t" );
- y2milestone ("symbol bigger: %1", `s < `t );
- y2milestone ("boolean bigger: %1", false < true );
- y2milestone ("list bigger: %1", [1] < [2] );
- y2milestone ("list bigger: %1", [1,1] < [nil,1] );
- y2milestone ("list bigger: %1", [1,1] < [1,1,1] );
- y2milestone ("list bigger: %1", [1,1,1,1] > [1,1,1] );
- y2milestone ("map bigger: %1", $[1:2,"s":3] >= $[2:3,"s":2] );
- y2milestone ("path bigger: %1", .ba >= ."a?" );
- y2milestone ("path bigger: %1", ."b?" >= .ab );
-//cannot mix types, only if it can be convert
-//y2milestone ("symbol string bigger: %1", `s < "t" );
-
- map<string,map<string,string> > m = $["a" : $["b":"c"] ];
- y2milestone ("clear map: %1", m["a","b"]:"n" );
- y2milestone ("clear map: %1", m["a","c"]:"n" );
-
- list<list<string> > l = [["b","c"]];
- y2milestone ("clear list: %1", l[0,1]:"n" );
- y2milestone ("clear list: %1", l[0,2]:"n" );
- y2milestone ("clear list: %1", l[1,0]:"n" );
-
- term t = `a(`b,`c);
- y2milestone ("clear list: %1", t[1]:`n );
- y2milestone ("clear list: %1", t[2]:`n );
- y2milestone ("clear list: %1", t[0]:`n );
-
- map<string,list<string> > n = $["a":["b","c"]];
- y2milestone ("map list: %1", n["a",0]:"n" );
- y2milestone ("map list: %1", n["a",2]:"n" );
-
- map<string,any> z = $["a":["b","c"], "b":`a(`b,`c)];
- y2milestone ("map term: %1", z["a",0]:"n" );
- y2milestone ("map term: %1", z["b",1]:`n );
- y2milestone ("map term: %1", z["b",2]:`n );
-
- list ta = [0];
- list ma = [[0]];
- y2milestone ("list add: %1", ta+1);
- y2milestone ("list add: %1", ta+ma);
-
- y2milestone ("string add %1", "s"+15);
- y2milestone ("string add %1", "s"+`c);
- y2milestone ("string add %1", "s"+.etc);
-
- y2milestone ("float substract: %1", 1.2-2.3);
-
- y2milestone ("int modulo: %1", 5%2);
-
- y2milestone ("int negate: %1", ~5);
- y2milestone ("int negate: %1", ~8589934592);
- y2milestone ("int negate: %1", ~-558589934592);
-
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.8/tests/ruby/test_helper.rb new/yast2-ruby-bindings-3.1.9/tests/ruby/test_helper.rb
--- old/yast2-ruby-bindings-3.1.8/tests/ruby/test_helper.rb 2014-02-05 15:40:42.000000000 +0100
+++ new/yast2-ruby-bindings-3.1.9/tests/ruby/test_helper.rb 2014-02-13 17:05:21.000000000 +0100
@@ -4,7 +4,9 @@
if !File.exists? "#{binary_path}/yast"
FileUtils.ln_s binary_path, "#{binary_path}/yast" #to load builtinx.so
end
+if !File.exists? "#{binary_path}/plugin"
+ FileUtils.ln_s binary_path, "#{binary_path}/plugin" #to load py2lang_ruby.so for calling testing ruby clients
+end
$:.unshift binary_path # yastx.so
$:.unshift "#{ROOT_DIR}/src/ruby" # yast.rb
-ENV["Y2DIR"] = File.dirname(__FILE__)
-
+ENV["Y2DIR"] = binary_path + ":" + File.dirname(__FILE__) + "/test_module"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.8/tests/ruby/test_module/clients/test_client.rb new/yast2-ruby-bindings-3.1.9/tests/ruby/test_module/clients/test_client.rb
--- old/yast2-ruby-bindings-3.1.8/tests/ruby/test_module/clients/test_client.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ruby-bindings-3.1.9/tests/ruby/test_module/clients/test_client.rb 2014-02-13 17:05:21.000000000 +0100
@@ -0,0 +1,15 @@
+module Yast
+ class TestClient
+ A_CONSTANT = 1
+
+ def main
+ Yast.include self, "example.rb"
+ @test
+ end
+ end unless const_defined? :TestClient
+ # Clients are re-eval-ed to mimic the YCP behavior;
+ # but we skip the class redefinition
+ # to avoid warnings about redefined constants
+end
+
+Yast::TestClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.8/tests/ruby/test_module/include/example.rb new/yast2-ruby-bindings-3.1.9/tests/ruby/test_module/include/example.rb
--- old/yast2-ruby-bindings-3.1.8/tests/ruby/test_module/include/example.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ruby-bindings-3.1.9/tests/ruby/test_module/include/example.rb 2014-02-13 17:05:21.000000000 +0100
@@ -0,0 +1,11 @@
+module Yast
+ module ExampleInclude
+ def initialize_example target
+ @test = 15
+ end
+
+ def test_plus_five
+ @test + 5
+ end
+ end
+end
Files old/yast2-ruby-bindings-3.1.8/tests/ruby/test_module/modules/ExampleTestModule.ybc and new/yast2-ruby-bindings-3.1.9/tests/ruby/test_module/modules/ExampleTestModule.ybc differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.8/tests/ruby/test_module/modules/ExampleTestModule.ycp new/yast2-ruby-bindings-3.1.9/tests/ruby/test_module/modules/ExampleTestModule.ycp
--- old/yast2-ruby-bindings-3.1.8/tests/ruby/test_module/modules/ExampleTestModule.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ruby-bindings-3.1.9/tests/ruby/test_module/modules/ExampleTestModule.ycp 2014-02-13 17:05:21.000000000 +0100
@@ -0,0 +1,18 @@
+//WARNING compile after each change!
+{
+ module "ExampleTestModule";
+
+ global string example_string = "x86_64";
+
+ global map<string,integer> sparc_map() {
+ return $["one": 1, "two": 2];
+ }
+
+ global boolean is_xen() {
+ return false;
+ }
+
+ global string arch_short() {
+ return "ZX Spectrum";
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.8/tests/ruby/wfm_spec.rb new/yast2-ruby-bindings-3.1.9/tests/ruby/wfm_spec.rb
--- old/yast2-ruby-bindings-3.1.8/tests/ruby/wfm_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ruby-bindings-3.1.9/tests/ruby/wfm_spec.rb 2014-02-13 17:05:21.000000000 +0100
@@ -0,0 +1,33 @@
+#!/usr/bin/env rspec
+
+require_relative "test_helper_rspec"
+
+require "yast"
+
+module Yast
+ describe WFM do
+ describe ".CallFunction" do
+ it "calls yast client via component system returning its value" do
+ expect(WFM.CallFunction("test_client")).to eq 15
+ end
+
+ it "always properly initialize client (BNC#861529)" do
+ expect(WFM.CallFunction("test_client")).to eq 15
+ expect(WFM.CallFunction("test_client")).to eq 15
+ end
+
+ it "produces no warning (about redefined constants)" do
+ # require_relative does not work in -e
+ helper = $LOADED_FEATURES.grep(/test_helper_rspec/).first
+ script = <<-EOS
+ load '#{helper}'
+ require 'yast'
+ Yast::WFM.CallFunction('test_client')
+ Yast::WFM.CallFunction('test_client')
+ EOS
+ stdout_stderr = `ruby -e "#{script}" 2>&1`
+ expect(stdout_stderr).to eq ""
+ end
+ end
+ end
+end
continue with "q"...
Checked in at Fri Feb 14 14:02:01 CET 2014 by ro
Remember to have fun...
--
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] Request 32647 changed to accepted (submit SUSE:SLE-12:GA/yast2-ruby-bindings)
by Ruediger Oertel 14 Feb '14
by Ruediger Oertel 14 Feb '14
14 Feb '14
Visit https://build.suse.de/request/show/32647
State of request 32647 was changed by oertel:
new -> accepted
Comment:
Accepted submit request 32647 from user leonardocf
Actions:
- submit Devel:YaST:Head/yast2-ruby-bindings => SUSE:SLE-12:GA/yast2-ruby-bindings
--
Configure notifications at https://build.suse.de/user/notifications
SUSE Internal OBS Instance (https://build.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
Script 'mail_helper' called by ro
Hello packager,
This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: ro.
Here comes the log...
---------------------------%<------------------------------
Hi,
here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-pkg-bindings -> sle12
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-pkg-bindings/yast2-pkg-bindings.changes 2014-01-17 14:16:32.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-pkg-bindings/yast2-pkg-bindings.changes 2014-02-13 20:13:32.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Feb 13 16:35:53 UTC 2014 - lslezak(a)suse.cz
+
+- Pkg::ServiceRefresh() - add, refresh and load also the new added
+ repositories from the service
+- 3.1.4
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-pkg-bindings
- at least 72 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-pkg-bindings (Old)
and /mounts/work_src_done/SLE12/yast2-pkg-bindings (BS:build ID:32746 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-pkg-bindings", Maintainer is "yast-commit(a)opensuse.org"
Old:
----
yast2-pkg-bindings-3.1.3.tar.bz2
New:
----
yast2-pkg-bindings-3.1.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.rIo0YU/_old 2014-02-14 14:01:00.000000000 +0100
+++ /var/tmp/diff_new_pack.rIo0YU/_new 2014-02-14 14:01:00.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-pkg-bindings-devel-doc
+# spec file for package yast2-pkg-bindings
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,10 +15,11 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
Name: yast2-pkg-bindings-devel-doc
-Version: 3.1.3
+Version: 3.1.4
Release: 0
+License: GPL-2.0
+Group: Documentation/HTML
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-pkg-bindings-%{version}.tar.bz2
Prefix: %_prefix
@@ -32,10 +33,9 @@
BuildRequires: yast2-core-devel
BuildRequires: yast2-devtools >= 3.1.10
-BuildArch: noarch
+Buildarch: noarch
Requires: yast2-pkg-bindings = %{version}
Summary: YaST2 - Documentation for yast2-pkg-bindings package
-License: GPL-2.0
Group: Documentation/HTML
%description
@@ -54,11 +54,10 @@
%install
%yast_install
+
%files
%defattr(-,root,root)
# do not use yast_docdir macro as it use wrong pkg name
%dir %{_datadir}/doc/packages/yast2-pkg-bindings
%doc %{_datadir}/doc/packages/yast2-pkg-bindings/xml
%exclude %{_datadir}/doc/packages/yast2-pkg-bindings/COPYING
-
-%changelog
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.rIo0YU/_old 2014-02-14 14:01:00.000000000 +0100
+++ /var/tmp/diff_new_pack.rIo0YU/_new 2014-02-14 14:01:00.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-pkg-bindings
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,12 +17,15 @@
Name: yast2-pkg-bindings
-Version: 3.1.3
+Version: 3.1.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
+Group: System/YaST
+License: GPL-2.0
+
BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc-c++
BuildRequires: libtool
@@ -35,8 +38,6 @@
Requires: libzypp >= 14.2.1
Summary: YaST2 - Package Manager Access
-License: GPL-2.0
-Group: System/YaST
%description
This package contains a name space for accessing the package manager
@@ -55,10 +56,9 @@
rm -rf %{buildroot}/%{yast_plugindir}/libpy2Pkg.la
+
%files
%defattr(-,root,root)
%{yast_plugindir}/libpy2Pkg.so.*
%{yast_plugindir}/libpy2Pkg.so
%doc %{yast_docdir}
-
-%changelog
++++++ yast2-pkg-bindings-3.1.3.tar.bz2 -> yast2-pkg-bindings-3.1.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.3/package/yast2-pkg-bindings-devel-doc.spec new/yast2-pkg-bindings-3.1.4/package/yast2-pkg-bindings-devel-doc.spec
--- old/yast2-pkg-bindings-3.1.3/package/yast2-pkg-bindings-devel-doc.spec 2014-01-10 11:11:00.000000000 +0100
+++ new/yast2-pkg-bindings-3.1.4/package/yast2-pkg-bindings-devel-doc.spec 2014-02-14 10:44:38.000000000 +0100
@@ -16,7 +16,7 @@
#
Name: yast2-pkg-bindings-devel-doc
-Version: 3.1.3
+Version: 3.1.4
Release: 0
License: GPL-2.0
Group: Documentation/HTML
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.3/package/yast2-pkg-bindings.changes new/yast2-pkg-bindings-3.1.4/package/yast2-pkg-bindings.changes
--- old/yast2-pkg-bindings-3.1.3/package/yast2-pkg-bindings.changes 2014-01-10 11:11:00.000000000 +0100
+++ new/yast2-pkg-bindings-3.1.4/package/yast2-pkg-bindings.changes 2014-02-14 10:44:38.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Feb 13 16:35:53 UTC 2014 - lslezak(a)suse.cz
+
+- Pkg::ServiceRefresh() - add, refresh and load also the new added
+ repositories from the service
+- 3.1.4
+
+-------------------------------------------------------------------
Fri Jan 10 09:02:41 UTC 2014 - lslezak(a)suse.cz
- zypp::filesystem::TmpDir::defaultLocation() already contains
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.3/package/yast2-pkg-bindings.spec new/yast2-pkg-bindings-3.1.4/package/yast2-pkg-bindings.spec
--- old/yast2-pkg-bindings-3.1.3/package/yast2-pkg-bindings.spec 2014-01-10 11:11:00.000000000 +0100
+++ new/yast2-pkg-bindings-3.1.4/package/yast2-pkg-bindings.spec 2014-02-14 10:44:38.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-pkg-bindings
-Version: 3.1.3
+Version: 3.1.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.3/src/Service.cc new/yast2-pkg-bindings-3.1.4/src/Service.cc
--- old/yast2-pkg-bindings-3.1.3/src/Service.cc 2014-01-10 11:11:00.000000000 +0100
+++ new/yast2-pkg-bindings-3.1.4/src/Service.cc 2014-02-14 10:44:38.000000000 +0100
@@ -26,6 +26,7 @@
*/
#include "PkgFunctions.h"
+#include "PkgProgress.h"
#include "log.h"
#include <ycp/YCPValue.h>
@@ -372,9 +373,11 @@
return YCPBoolean(false);
}
+ const std::string alias_str(alias->value());
+
zypp::RepoManager* repomanager = CreateRepoManager();
- if (!service_manager.RefreshService(alias->value(), *repomanager))
+ if (!service_manager.RefreshService(alias_str, *repomanager))
{
return YCPBoolean(false);
}
@@ -403,6 +406,31 @@
}
}
+ // check whether there are new added repositories and load them
+ std::list<zypp::RepoInfo> reps = repomanager->knownRepositories();
+ for (std::list<zypp::RepoInfo>::iterator it = reps.begin();
+ it != reps.end(); ++it)
+ {
+ if (it->service() == alias_str && !logFindAlias(it->alias()))
+ continue;
+
+ y2milestone("Service added a new repository: %s", it->alias().c_str());
+ YRepo_Ptr new_repo = new YRepo(*it);
+ repos.push_back(new_repo);
+
+ if (it->enabled())
+ {
+ y2milestone("Refreshing service: %s", it->alias().c_str());
+ // refresh and load resolvables
+ PkgProgress pkgprogress(_callbackHandler);
+ zypp::ProgressData progress(100);
+ progress.sendTo(pkgprogress.Receiver());
+ zypp::CombinedProgressData subprogrcv_ref(progress, 20);
+
+ LoadResolvablesFrom(new_repo, subprogrcv_ref);
+ }
+ }
+
return YCPBoolean(true);
}
catch (const zypp::Exception& excpt)
continue with "q"...
Checked in at Fri Feb 14 14:01:44 CET 2014 by ro
Remember to have fun...
--
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] Request 32746 changed to accepted (submit SUSE:SLE-12:GA/yast2-pkg-bindings)
by Ruediger Oertel 14 Feb '14
by Ruediger Oertel 14 Feb '14
14 Feb '14
Visit https://build.suse.de/request/show/32746
State of request 32746 was changed by oertel:
new -> accepted
Comment:
Accepted submit request 32746 from user leonardocf
Actions:
- submit Devel:YaST:Head/yast2-pkg-bindings => SUSE:SLE-12:GA/yast2-pkg-bindings
--
Configure notifications at https://build.suse.de/user/notifications
SUSE Internal OBS Instance (https://build.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] Request 32661 changed to accepted (submit SUSE:SLE-12:GA/yast2-ldap)
by Ruediger Oertel 14 Feb '14
by Ruediger Oertel 14 Feb '14
14 Feb '14
Visit https://build.suse.de/request/show/32661
State of request 32661 was changed by oertel:
new -> accepted
Comment:
Accepted submit request 32661 from user licensedigger
Actions:
- submit Devel:YaST:Head/yast2-ldap => SUSE:SLE-12:GA/yast2-ldap
--
Configure notifications at https://build.suse.de/user/notifications
SUSE Internal OBS Instance (https://build.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
Script 'mail_helper' called by ro
Hello packager,
This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: ro.
Here comes the log...
---------------------------%<------------------------------
Hi,
here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-ldap -> sle12
## BNC# 863329 : "Missing Ldap::Export()" (CLOSED/FIXED)
## BNC# 863612 : "YaST reports Cannot find client ldap/routines.rb" (CLOSED/FIXED)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-ldap/yast2-ldap.changes 2014-02-12 11:50:20.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-ldap/yast2-ldap.changes 2014-02-13 17:56:44.000000000 +0100
@@ -1,0 +2,15 @@
+Thu Feb 13 11:12:38 UTC 2014 - varkoly(a)suse.com
+
+- Remove not used subroutines from the Ldap module
+- BNC#863329 - Missing Ldap::Export()
+- BNC#863612 YaST reports Cannot find client ldap/routines.rb
+- Simplify ldap-conf agent: Until now ldap informations was saved in
+ 3 places: /etc/ldap.conf /etc/openldap/ldap.conf and the sysconfig
+ file ldap. From now on only /etc/openldap/ldap.conf will be used.
+ /etc/ldap.conf is only for nss_ldap which is not provided anymore
+ The variable BIND_DN in sysconfig file ldap can saved in
+ /etc/openldap/ldap.conf too. BASE_CONFIG_DN was everytime
+ ou=ldapconfig,$BASE
+- 3.1.6
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-auth-server
- yast2-dhcp-server
- yast2-dns-server
- yast2-ftp-server
- yast2-inetd
- yast2-ldap
- yast2-mail
- yast2-samba-server
- yast2-sudo
- yast2-users
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-ldap (Old)
and /mounts/work_src_done/SLE12/yast2-ldap (BS:build ID:32661 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ldap", Maintainer is "yast-commit(a)opensuse.org"
Old:
----
yast2-ldap-3.1.5.tar.bz2
New:
----
yast2-ldap-3.1.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ldap.spec ++++++
--- /var/tmp/diff_new_pack.x52nZH/_old 2014-02-14 14:00:36.000000000 +0100
+++ /var/tmp/diff_new_pack.x52nZH/_new 2014-02-14 14:00:36.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-ldap
-Version: 3.1.5
+Version: 3.1.6
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -30,6 +30,7 @@
Summary: YaST2 - LDAP Agent
Requires: ldapcpplib yast2 yast2-network
Conflicts: yast2-ldap-client < 3.1.5
+Conflicts: yast2-auth-client < 3.1.6
%description
This agent is used by various YaST2 modules to work with LDAP. It
++++++ yast2-ldap-3.1.5.tar.bz2 -> yast2-ldap-3.1.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.5/conf/Makefile.am new/yast2-ldap-3.1.6/conf/Makefile.am
--- old/yast2-ldap-3.1.5/conf/Makefile.am 2014-02-11 17:50:19.000000000 +0100
+++ new/yast2-ldap-3.1.6/conf/Makefile.am 2014-02-13 17:53:16.000000000 +0100
@@ -2,6 +2,6 @@
# Makefile.am for .../agent-ldap/conf
#
-scrconf_DATA = ldap.scr cfg_ldap.scr
+scrconf_DATA = ldap.scr ldap_conf.scr
EXTRA_DIST = $(scrconf_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.5/conf/cfg_ldap.scr new/yast2-ldap-3.1.6/conf/cfg_ldap.scr
--- old/yast2-ldap-3.1.5/conf/cfg_ldap.scr 2014-02-11 17:50:19.000000000 +0100
+++ new/yast2-ldap-3.1.6/conf/cfg_ldap.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-/**
- * File:
- * cfg_ldap.scr
- * Summary:
- * SCR Agent for reading/writing /etc/sysconfig/ldap
- * using the sysconfig-agent
- *
- * $Id$
- *
- * Read/Sets the values defined in <tt>/etc/sysconfig/ldap</tt>
- * in an easy manner.
- */
-.sysconfig.ldap
-
-`ag_ini(
- `SysConfigFile("/etc/sysconfig/ldap")
-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.5/conf/ldap_conf.scr new/yast2-ldap-3.1.6/conf/ldap_conf.scr
--- old/yast2-ldap-3.1.5/conf/ldap_conf.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ldap-3.1.6/conf/ldap_conf.scr 2014-02-13 17:53:16.000000000 +0100
@@ -0,0 +1,40 @@
+/**
+ * File:
+ * ldap_conf.scr
+ * Summary:
+ * SCR Agent for reading/writing /etc/ldap.conf using the ini-agent
+ * Access:
+ * read/write
+ * Authors:
+ * Peter Varkoly <varkoly(a)suse.com>
+ * See:
+ * yast2-agent-ini
+ * libscr
+ * man ldap.conf
+ * Example:
+ * Dir(.ldap_conf)
+ * (["base", "host"])
+ **
+ * Read(.ldap_conf.v.host)
+ * ("10.10.0.149")
+ **
+ * Write(.etc.ldap_conf.v.base, "dc=myodmain, dc=com")
+ * (true)
+ *
+ *
+ * .ldap_conf
+ */
+.ldap_conf
+
+`ag_ini(
+ `IniAgent( "/etc/openldap/ldap.conf" ,
+ $[ "options" : ["global_values", "repeat_names"],
+ "comments" : [ "^#.*", "^[ \t]*$", ],
+ "params" : [
+ $[ "match" : [ "^[ \t]*([a-zA-Z0-9_]+)[ \t]+(.*[^ \t]|)[ \t]*$",
+ "%s\t%s",
+ ]
+ ]
+ ]
+ ]))
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.5/package/yast2-ldap.changes new/yast2-ldap-3.1.6/package/yast2-ldap.changes
--- old/yast2-ldap-3.1.5/package/yast2-ldap.changes 2014-02-11 17:50:19.000000000 +0100
+++ new/yast2-ldap-3.1.6/package/yast2-ldap.changes 2014-02-13 17:53:16.000000000 +0100
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Thu Feb 13 11:12:38 UTC 2014 - varkoly(a)suse.com
+
+- Remove not used subroutines from the Ldap module
+- BNC#863329 - Missing Ldap::Export()
+- BNC#863612 YaST reports Cannot find client ldap/routines.rb
+- Simplify ldap-conf agent: Until now ldap informations was saved in
+ 3 places: /etc/ldap.conf /etc/openldap/ldap.conf and the sysconfig
+ file ldap. From now on only /etc/openldap/ldap.conf will be used.
+ /etc/ldap.conf is only for nss_ldap which is not provided anymore
+ The variable BIND_DN in sysconfig file ldap can saved in
+ /etc/openldap/ldap.conf too. BASE_CONFIG_DN was everytime
+ ou=ldapconfig,$BASE
+- 3.1.6
+
+-------------------------------------------------------------------
Tue Feb 11 16:33:18 UTC 2014 - jreidinger(a)suse.com
- add missing sysconfig ldap agent
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.5/package/yast2-ldap.spec new/yast2-ldap-3.1.6/package/yast2-ldap.spec
--- old/yast2-ldap-3.1.5/package/yast2-ldap.spec 2014-02-11 17:50:19.000000000 +0100
+++ new/yast2-ldap-3.1.6/package/yast2-ldap.spec 2014-02-13 17:53:16.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-ldap
-Version: 3.1.5
+Version: 3.1.6
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -30,6 +30,7 @@
Summary: YaST2 - LDAP Agent
Requires: ldapcpplib yast2 yast2-network
Conflicts: yast2-ldap-client < 3.1.5
+Conflicts: yast2-auth-client < 3.1.6
%description
This agent is used by various YaST2 modules to work with LDAP. It
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.5/src/Ldap.rb new/yast2-ldap-3.1.6/src/Ldap.rb
--- old/yast2-ldap-3.1.5/src/Ldap.rb 2014-02-11 17:50:19.000000000 +0100
+++ new/yast2-ldap-3.1.6/src/Ldap.rb 2014-02-13 17:53:16.000000000 +0100
@@ -19,11 +19,12 @@
# current contact information at www.novell.com.
# ------------------------------------------------------------------------------
-# File: modules/Ldap.ycp
-# Module: Configuration of LDAP client
-# Summary: LDAP client configuration data, I/O functions.
-# Authors: Thorsten Kukuk <kukuk(a)suse.de>
-# Anas Nashif <nashif(a)suse.de>
+# File: modules/Ldap.ycp
+# Module: Configuration of LDAP client
+# Summary: LDAP client configuration data, I/O functions.
+# Authors: Peter Varkoly <varkoly(a)suse.com>
+# Thorsten Kukuk <kukuk(a)suse.de>
+# Anas Nashif <nashif(a)suse.de>
#
# $Id$
require "yast"
@@ -102,7 +103,7 @@
# base DN
@base_dn = ""
- @old_base_dn = nil
+ @old_base_dn = ""
@base_dn_changed = false
@ldap_tls = true
@@ -371,42 +372,13 @@
@read_settings
end
- # For sssd, some kerberos values are needed
- def ReadKrb5Conf
- realm = Convert.convert(
- SCR.Read(path(".etc.krb5_conf.v.libdefaults.default_realm")),
- :from => "any",
- :to => "list <string>"
- )
- realm = [] if realm == nil
- @krb5_realm = Ops.get(realm, 0, "")
-
- kdcs = Convert.convert(
- SCR.Read(
- Builtins.add(
- Builtins.add(path(".etc.krb5_conf.v"), @krb5_realm),
- "kdc"
- )
- ),
- :from => "any",
- :to => "list <string>"
- )
- kdcs = [] if kdcs == nil
- @krb5_kdcip = Builtins.mergestring(kdcs, ",")
-
- true
- end
-
-
- # Read single entry from /etc/ldap.conf file
+ # Read single entry from /etc/openldap/ldap.conf file
# @param [String] entry entry name
# @param [String] defvalue default value if entry is not present
# @return entry value
def ReadLdapConfEntry(entry, defvalue)
value = defvalue
- ret = SCR.Read(
- Builtins.add(path(".etc.ldap_conf.v.\"/etc/ldap.conf\""), entry)
- )
+ ret = SCR.Read(".ldap_conf.v."+ entry )
if ret == nil
value = defvalue
elsif Ops.is_list?(ret)
@@ -417,13 +389,11 @@
value
end
- # Read multi-valued entry from /etc/ldap.conf file
+ # Read multi-valued entry from /etc/openldap/ldap.conf file
# @param [String] entry entry name
# @return entry value
def ReadLdapConfEntries(entry)
- ret = SCR.Read(
- Builtins.add(path(".etc.ldap_conf.v.\"/etc/ldap.conf\""), entry)
- )
+ ret = SCR.Read( ".ldap_conf.v."+ entry )
if ret == nil
return []
elsif Ops.is_list?(ret)
@@ -433,22 +403,18 @@
end
end
- # Write (single valued) entry to /etc/ldap.conf
+ # Write (single valued) entry to /etc/openldap/ldap.conf
# @param [String] entry name
# @param [String] value; if value is nil, entry will be removed
def WriteLdapConfEntry(entry, value)
- SCR.Write(
- Builtins.add(path(".etc.ldap_conf.v.\"/etc/ldap.conf\""), entry),
- value == nil ? nil : [value]
- )
-
+ SCR.Write( ".ldap_conf.v." + entry, value.nil ? nil : [value] )
nil
end
- # Write (possibly multi valued) entry to /etc/ldap.conf
+ # Write (possibly multi valued) entry to /etc/openldap/ldap.conf
# @param [String] entry name
# @param [Array<String>] value it is of type [attr1, attr2],
- # in /etc/ldap.conf should be written as "entry attr1 attr2"
+ # in /etc/openldap/ldap.conf should be written as "entry attr1 attr2"
# @example to write "nss_map_attribute uniquemember member", call
# WriteLdapConfEntries ("nss_map_attribute", ["uniquemember", "member"])
def WriteLdapConfEntries(entry, value)
@@ -465,15 +431,12 @@
end
end
values = [Builtins.mergestring(value, " ")] if Builtins.size(current) == 0
- SCR.Write(
- Builtins.add(path(".etc.ldap_conf.v.\"/etc/ldap.conf\""), entry),
- values
- )
+ SCR.Write( ".ldap_conf.v." + entry, values )
nil
end
- # Add a new value to the entry in /etc/ldap.conf
+ # Add a new value to the entry in /etc/openldap/ldap.conf
# @param [String] entry name
# @param [String] value
def AddLdapConfEntry(entry, value)
@@ -481,10 +444,7 @@
current = Builtins.maplist(current) { |e| Builtins.tolower(e) }
if !Builtins.contains(current, Builtins.tolower(value))
- SCR.Write(
- Builtins.add(path(".etc.ldap_conf.v.\"/etc/ldap.conf\""), entry),
- Builtins.union(current, [value])
- )
+ SCR.Write( ".ldap_conf.v." + entry, current | [value] )
end
nil
@@ -502,8 +462,13 @@
Builtins.maplist(Builtins.splitstring(uri, " \t")) do |u|
url = URL.Parse(u)
h = Ops.get_string(url, "host", "")
- if Ops.get_string(url, "port", "") != ""
- h = Builtins.sformat("%1:%2", h, Ops.get_string(url, "port", ""))
+ p = Ops.get_string(url, "port", "")
+ if Ops.get_string(url, "scheme","") == "ldaps"
+ @ldap_tls = "yes"
+ end
+ if p != ""
+ @ldap_tls = "yes" if( p == "636" || p == "ldaps" )
+ h = "#{h}:#{p}"
end
h
end,
@@ -531,25 +496,19 @@
CheckOES()
- Builtins.foreach(["passwd", "group", "passwd_compat", "group_compat"]) do |db|
- Ops.set(@nsswitch, db, Nsswitch.ReadDb(db))
- end
+ ["passwd", "group", "passwd_compat", "group_compat"].each { |db| @nsswitch[db] = Nsswitch.ReadDb(db) }
# 'start' means that LDAP is present in nsswitch somehow... either as 'compat'/'ldap'...
- @start = Builtins.contains(Ops.get_list(@nsswitch, "passwd", []), "ldap") ||
- Builtins.contains(Ops.get_list(@nsswitch, "passwd", []), "compat") &&
- Builtins.contains(
- Ops.get_list(@nsswitch, "passwd_compat", []),
- "ldap"
- ) ||
- @oes && Builtins.contains(Ops.get_list(@nsswitch, "passwd", []), "nam")
+ @start = @nsswitch["passwd"].include?("ldap") ||
+ ( @nsswitch["passwd"].include?("compat") && @nsswitch["passwd_compat"].include?("ldap") ) ||
+ ( @auth["oes"] && @nsswitch["passwd"].include?("nam") )
if @start
# nss_ldap is used
@sssd = false
else
# ... or as 'sssd'
- @sssd = Builtins.contains(Ops.get_list(@nsswitch, "passwd", []), "sss")
+ @sssd = @nsswitch["passwd"].include?("sss")
@start = @sssd
end
@@ -559,32 +518,38 @@
@sssd = false
end
- @old_start = @start
-
- @nis_available = Builtins.contains(
- Ops.get_list(@nsswitch, "passwd", []),
- "nis"
- ) ||
- Builtins.contains(Ops.get_list(@nsswitch, "passwd", []), "compat") &&
- (Builtins.contains(
- Ops.get_list(@nsswitch, "passwd_compat", []),
- "nis"
- ) ||
- Builtins.size(Ops.get_list(@nsswitch, "passwd_compat", [])) == 0)
+ @nis_available = @nsswitch["passwd"].include?("nis") ||
+ ( @nsswitch["passwd"].include?("compat") &&
+ @nsswitch["passwd_compat"].include?("nis") ||
+ @nsswitch["passwd_compat"].empty? )
@nis_available = @nis_available && Service.Status("ypbind") == 0
- @server = ReadLdapHosts()
+ @server = ReadLdapHosts()
+ @base_dn = ReadLdapConfEntry("BASE", "")
+ @tls_cacert = ReadLdapConfEntry("TLS_CACERT", "")
+ @tls_cacertdir = ReadLdapConfEntry("TLS_CACERTDIR", "")
+ @bind_dn = ReadLdapConfEntry("BINDDN","cn=Administrator," + @base_dn )
+ @base_config_dn = "ou=ldapconfig," +@base_dn
- @base_dn = ReadLdapConfEntry("base", "")
+ true
+ end
- @old_base_dn = @base_dn
- @old_server = @server
+ # Dump the LDAP settings to a map based on /etc/openldap/slapd.conf
+ # @return $["start":, "servers":[...], "domain":]
+ def Export
+ e = {
+ "start_ldap" => @start,
+ "ldap_server" => @server,
+ "ldap_domain" => @base_dn,
+ "ldap_tls" => @ldap_tls,
+ "bind_dn" => @bind_dn,
+ "base_config_dn" => @base_config_dn
+ }
+ end
+ def FindLDAPServer
# ask DNS for LDAP server address if none is defined
- if (@server == "" ||
- @server == "127.0.0.1" && @base_dn == "dc=example,dc=com") &&
- FileUtils.Exists("/usr/bin/dig") &&
- !Mode.test
+ return nil unless FileUtils.Exists("/usr/bin/dig")
domain = Hostname.CurrentDomain
# workaround for bug#393951
if domain == "" && Stage.cont
@@ -637,165 +602,7 @@
@base_dn = dn
end
end
- end
-
- @ldap_tls = ReadLdapConfEntry("ssl", "no") == "start_tls"
- @tls_cacertdir = ReadLdapConfEntry("tls_cacertdir", "")
- @tls_cacertfile = ReadLdapConfEntry("tls_cacertfile", "")
- @tls_checkpeer = ReadLdapConfEntry("tls_checkpeer", "yes")
-
- @nss_base_passwd = ReadLdapConfEntry("nss_base_passwd", @base_dn)
- @nss_base_shadow = ReadLdapConfEntry("nss_base_shadow", @base_dn)
- @nss_base_group = ReadLdapConfEntry("nss_base_group", @base_dn)
-
- @pam_password = ReadLdapConfEntry("pam_password", "exop")
- # check if Password Modify extenstion is supported (bnc#546398, c#6)
- if @pam_password == "exop"
- if 0 == SCR.Execute(path(".target.bash"), "ldapsearch -x -b '' -s base") &&
- 0 !=
- SCR.Execute(
- path(".target.bash"),
- "ldapsearch -x -b '' -s base supportedExtension | grep -i '^supportedExtension:[[:space:]]*1.3.6.1.4.1.4203.1.11.1'"
- ) # LDAP server accessible
- Builtins.y2warning(
- "'exop' value not supported on server, using 'crypt'"
- )
- @pam_password = "crypt"
- end
- end
-
- # read sysconfig values
- @base_config_dn = Convert.to_string(
- SCR.Read(path(".sysconfig.ldap.BASE_CONFIG_DN"))
- )
- @base_config_dn = "" if @base_config_dn == nil
-
- @file_server = Convert.to_string(
- SCR.Read(path(".sysconfig.ldap.FILE_SERVER"))
- ) == "yes"
-
- if @read_settings || @bind_dn == ""
- @bind_dn = Convert.to_string(SCR.Read(path(".sysconfig.ldap.BIND_DN")))
- end
- if @bind_dn == nil || @bind_dn == ""
- @bind_dn = ReadLdapConfEntry("binddn", "")
- end
-
- if @read_settings || @member_attribute == ""
- map_attrs = ReadLdapConfEntries("nss_map_attribute")
- Builtins.foreach(map_attrs) do |map_attr|
- if Builtins.issubstring(Builtins.tolower(map_attr), "uniquemember")
- attr = Builtins.splitstring(map_attr, " \t")
- if Builtins.tolower(Ops.get(attr, 0, "")) == "uniquemember"
- @member_attribute = Ops.get(attr, 1, @member_attribute)
- # LDAP needs to know correct attribute name
- if @member_attribute == "uniquemember"
- @member_attribute = "uniqueMember"
- end
- @old_member_attribute = @member_attribute
- end
- end
- end
- end
-
- # install on demand
- @_autofs_allowed = true
- @_start_autofs = @_autofs_allowed && Service.Enabled("autofs")
-
- # read /etc/passwd to check + line:
- if !Convert.to_boolean(
- SCR.Execute(path(".passwd.init"), { "base_directory" => "/etc" })
- )
- error = Convert.to_string(SCR.Read(path(".passwd.error")))
- Builtins.y2error("error: %1", error)
- else
- @passwd_read = true
- @plus_lines_passwd = Convert.convert(
- SCR.Read(path(".passwd.passwd.pluslines")),
- :from => "any",
- :to => "list <string>"
- )
- Builtins.foreach(@plus_lines_passwd) do |plus_line|
- plus = Builtins.splitstring(plus_line, ":")
- if Ops.get(plus, Ops.subtract(Builtins.size(plus), 1), "") == "/sbin/nologin"
- @login_enabled = false
- end
- end
- end
-
- @mkhomedir = Pam.Enabled("mkhomedir")
-
- Autologin.Read
-
- ReadKrb5Conf() if Pam.Enabled("krb5")
- if FileUtils.Exists("/etc/sssd/sssd.conf")
- # read realm and kdc from sssd.conf if available
- domain = Builtins.add(path(".etc.sssd_conf.v"), "domain/default")
- realm = Convert.to_string(SCR.Read(Builtins.add(domain, "krb5_realm")))
- @krb5_realm = realm if realm != nil
- kdc = Convert.to_string(SCR.Read(Builtins.add(domain, "krb5_kdcip")))
- @krb5_kdcip = kdc if kdc != nil
- schema = Convert.to_string(
- SCR.Read(Builtins.add(domain, "ldap_schema"))
- )
- @sssd_ldap_schema = schema if schema != nil
-
- cache_credentials = Convert.to_string(
- SCR.Read(Builtins.add(domain, "cache_credentials"))
- )
- @sssd_cache_credentials = cache_credentials != nil &&
- Builtins.tolower(cache_credentials) == "true"
- enumerate = Convert.to_string(
- SCR.Read(Builtins.add(domain, "enumerate"))
- )
- @sssd_enumerate = enumerate != nil &&
- Builtins.tolower(enumerate) == "true"
-
- id_start_tls = Convert.to_string(
- SCR.Read(Builtins.add(domain, "ldap_id_use_start_tls"))
- )
- if id_start_tls != nil
- @ldap_tls = Builtins.tolower(id_start_tls) == "true"
- else
- # true for SSSD by default, if not overriden by ldap_id_use_start_tls
- @ldap_tls = true
- end
-
- # replace nss_base_passwd with ldap_user_search_base (if it is set)
- user_base = Convert.to_string(
- SCR.Read(Builtins.add(domain, "ldap_user_search_base"))
- )
- @nss_base_passwd = user_base if user_base != nil
- group_base = Convert.to_string(
- SCR.Read(Builtins.add(domain, "ldap_group_search_base"))
- )
- @nss_base_group = group_base if group_base != nil
- end
- @sssd_with_krb = true if @krb5_realm != "" && @krb5_kdcip != ""
-
- # Now check if previous configuration of LDAP server didn't proposed
- # some better values:
- if Stage.cont
- if Ops.greater_than(Builtins.size(@initial_defaults), 0)
- Builtins.y2milestone("using values defined externaly")
- old_s = @old_server
- old_d = @old_base_dn
- old_m = @old_member_attribute
- Set(@initial_defaults)
- @old_server = old_s
- @old_base_dn = old_d
- @old_member_attribute = old_m
- end
- end
-
- if @member_attribute == ""
- @member_attribute = "member"
- @modified = true
- end
-
- true
end
-
# ------------- functions for work with LDAP tree contents ------------
# Error popup for errors detected during LDAP operation
@@ -940,10 +747,7 @@
def GetBindDN
if @bind_pass == nil && Builtins.size(@bind_dn) == 0
Builtins.y2milestone("--- bind dn not read yet or empty, reading now")
- @bind_dn = Convert.to_string(SCR.Read(path(".sysconfig.ldap.BIND_DN")))
- if @bind_dn == nil || @bind_dn == ""
- @bind_dn = ReadLdapConfEntry("binddn", "")
- end
+ @bind_dn = ReadLdapConfEntry("BINDDN", "")
end
@bind_dn
end
@@ -1241,7 +1045,7 @@
ret
end
- # Asks user for bind password to LDAP server
+ # Asks user for bind_dn and password to LDAP server
# @param anonymous if anonymous access could be allowed
# @return password
def GetLDAPPassword(enable_anonymous)
@@ -1249,8 +1053,9 @@
Opt(:decorated),
VBox(
HSpacing(40),
+ TextEntry(Id(:bdn), Opt(:hstretch), _("BindDN"), @bind_dn ),
# password entering label
- Password(Id(:pw), Opt(:hstretch), _("&LDAP Server Password")),
+ Password(Id(:pw), Opt(:hstretch), _("&LDAP Server Password")),
# label
Label(
Builtins.sformat(
@@ -1260,7 +1065,6 @@
)
),
# label (%1 is admin DN - string)
- Label(Builtins.sformat(_("Administrator: %1"), GetBindDN())),
ButtonBox(
PushButton(Id(:ok), Opt(:key_F10, :default), Label.OKButton),
# button label
@@ -1274,7 +1078,8 @@
ret = UI.UserInput
pw = ""
if ret == :ok
- pw = Convert.to_string(UI.QueryWidget(Id(:pw), :Value))
+ pw = Convert.to_string(UI.QueryWidget(Id(:pw), :Value))
+ @bind_dn = Convert.to_string(UI.QueryWidget(Id(:bdn), :Value))
@anonymous = false
elsif ret == :cancel
pw = nil
@@ -1976,208 +1781,9 @@
error == {} && @bind_pass != nil
end
- # Modify also /etc/openldap/ldap.conf for the use of
- # ldap client utilities (like ldapsearch)
- # @return modified?
- def WriteOpenLdapConf
- write_openldap_conf = @openldap_modified
-
- return false if !Package.Installed("openldap2-client")
-
- out = Convert.to_map(
- SCR.Execute(path(".target.bash_output"), "/bin/rpm -V openldap2-client")
- )
-
- open_host = []
- open_uri = Convert.to_list(
- SCR.Read(path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".uri"))
- )
- if open_uri == []
- open_uri = Convert.to_list(
- SCR.Read(path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".URI"))
- )
- end
- if open_uri == []
- open_host = Convert.to_list(
- SCR.Read(path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".host"))
- )
- else
- open_host = [uri2servers(Ops.get_string(open_uri, 0, ""))]
- end
- open_base = Convert.to_list(
- SCR.Read(path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".base"))
- )
-
- # if the config file was not modified by user yet
- if !Builtins.issubstring(
- Ops.get_string(out, "stdout", ""),
- "/etc/openldap/ldap.conf"
- )
- write_openldap_conf = true
- # if there are same values as in /etc/ldap.conf
- elsif @old_server == Ops.get_string(open_host, 0, "") &&
- @old_base_dn == Ops.get_string(open_base, 0, "")
- write_openldap_conf = true
- end
-
- if write_openldap_conf
- # update ldap.conf
- SCR.Write(
- path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".host"),
- nil
- )
-
- uri = Builtins.mergestring(
- Builtins.maplist(Builtins.splitstring(@server, " \t")) do |u|
- Ops.add("ldap://", u)
- end,
- " "
- )
-
- SCR.Write(
- path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".uri"),
- [uri]
- )
-
- SCR.Write(
- path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".base"),
- [@base_dn]
- )
-
- SCR.Write(
- path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".TLS_CACERTDIR"),
- @tls_cacertdir == "" ? nil : [@tls_cacertdir]
- )
- SCR.Write(
- path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".TLS_CACERT"),
- @tls_cacertfile == "" ? nil : [@tls_cacertfile]
- )
-
- Builtins.y2milestone("file /etc/openldap/ldap.conf was modified")
- end
- write_openldap_conf
- end
-
- # Write updated /etc/sssd/sssd.conf file
- def WriteSSSDConfig
- if !FileUtils.Exists("/etc/sssd/sssd.conf")
- Builtins.y2warning(
- "file /etc/sssd/sssd.conf does not exists: not writing"
- )
- return false
- end
-
- sections = SCR.Dir(path(".etc.sssd_conf.section"))
-
- SCR.Write(path(".etc.sssd_conf.v.sssd.domains"), "default")
-
-
- # "The "services" setting should have the value "nss, pam"
- SCR.Write(path(".etc.sssd_conf.v.sssd.services"), "nss,pam")
-
- # " Make sure that "filter_groups" and "filter_users" in the "[nss]" section contains "root".
- f_g = Convert.to_string(
- SCR.Read(path(".etc.sssd_conf.v.nss.filter_groups"))
- )
- f_g = "" if f_g == nil
- l = Convert.convert(
- Builtins.union(Builtins.splitstring(f_g, ","), ["root"]),
- :from => "list",
- :to => "list <string>"
- )
- SCR.Write(
- path(".etc.sssd_conf.v.nss.filter_groups"),
- Builtins.mergestring(l, ",")
- )
-
- f_u = Convert.to_string(
- SCR.Read(path(".etc.sssd_conf.v.nss.filter_users"))
- )
- f_u = "" if f_u == nil
- l = Convert.convert(
- Builtins.union(Builtins.splitstring(f_u, ","), ["root"]),
- :from => "list",
- :to => "list <string>"
- )
- SCR.Write(
- path(".etc.sssd_conf.v.nss.filter_users"),
- Builtins.mergestring(l, ",")
- )
-
- domain = Builtins.add(path(".etc.sssd_conf.v"), "domain/default")
-
- uri = Builtins.mergestring(
- Builtins.maplist(Builtins.splitstring(@server, " \t")) do |s|
- Builtins.sformat("ldap://%1", s)
- end,
- ","
- )
- SCR.Write(Builtins.add(domain, "ldap_uri"), uri)
- SCR.Write(Builtins.add(domain, "ldap_search_base"), @base_dn)
- SCR.Write(Builtins.add(domain, "ldap_schema"), @sssd_ldap_schema)
- SCR.Write(Builtins.add(domain, "id_provider"), "ldap")
- SCR.Write(Builtins.add(domain, "ldap_user_uuid"), "entryuuid")
- SCR.Write(Builtins.add(domain, "ldap_group_uuid"), "entryuuid")
-
- SCR.Write(
- Builtins.add(domain, "ldap_id_use_start_tls"),
- @ldap_tls ? "True" : "False"
- )
- SCR.Write(
- Builtins.add(domain, "enumerate"),
- @sssd_enumerate ? "True" : "False"
- )
- SCR.Write(
- Builtins.add(domain, "cache_credentials"),
- @sssd_cache_credentials ? "True" : "False"
- )
- SCR.Write(
- Builtins.add(domain, "ldap_tls_cacertdir"),
- @tls_cacertdir == "" ? nil : @tls_cacertdir
- )
- SCR.Write(
- Builtins.add(domain, "ldap_tls_cacert"),
- @tls_cacertfile == "" ? nil : @tls_cacertfile
- )
-
- # remove the keys if their value is same as default (base_dn)
- SCR.Write(
- Builtins.add(domain, "ldap_user_search_base"),
- @nss_base_passwd != @base_dn && @nss_base_passwd != "" ? @nss_base_passwd : nil
- )
- SCR.Write(
- Builtins.add(domain, "ldap_group_search_base"),
- @nss_base_group != @base_dn && @nss_base_group != "" ? @nss_base_group : nil
- )
-
- if !Builtins.contains(sections, "domain/default")
- SCR.Write(
- Builtins.add(path(".etc.sssd_conf.section_comment"), "domain/default"),
- "\n# Section created by YaST\n"
- )
- end
-
- # In a mixed Kerberos/LDAP setup the following changes are needed in the [domain/default] section:
- if @sssd_with_krb
- SCR.Write(Builtins.add(domain, "auth_provider"), "krb5")
- SCR.Write(Builtins.add(domain, "chpass_provider"), "krb5")
-
- SCR.Write(Builtins.add(domain, "krb5_realm"), @krb5_realm)
- SCR.Write(Builtins.add(domain, "krb5_kdcip"), @krb5_kdcip)
- else
- SCR.Write(Builtins.add(domain, "chpass_provider"), "ldap")
- SCR.Write(Builtins.add(domain, "auth_provider"), "ldap")
- end
-
- if !SCR.Write(path(".etc.sssd_conf"), nil)
- Builtins.y2error("error writing ldap.conf file")
- end
- true
- end
-
# If a file does not + entry, add it.
- # @param is login allowed?
- # @return success?
+ # @param is login allowed?
+ # @return success?
def WritePlusLine(login)
file = "/etc/passwd"
what = "+::::::"
@@ -2523,505 +2129,6 @@
@nds
end
- # Adpat passwd and group cache in /etc/nscd.conf
- # Caching should be disabled with sssd on
- # @param [Boolean] start_sssd if sssd will be started
- def WriteNscdCache(start_sssd)
- enable_cache = Convert.convert(
- SCR.Read(path(".etc.nscd_conf.v.enable-cache")),
- :from => "any",
- :to => "list <string>"
- )
- enable_cache = Builtins.maplist(enable_cache) do |sect|
- l = Builtins.filter(Builtins.splitstring(sect, " \t")) do |part|
- part != ""
- end
- if Ops.get(l, 0, "") == "passwd" || Ops.get(l, 0, "") == "group"
- next Builtins.sformat(
- "%1\t\t%2",
- Ops.get(l, 0, ""),
- start_sssd ? "no" : "yes"
- )
- end
- sect
- end
- return false if enable_cache == [] || enable_cache == nil
- ret = SCR.Write(path(".etc.nscd_conf.v.enable-cache"), enable_cache)
- # ensure the changes are written
- ret = ret && SCR.Write(path(".etc.nscd_conf"), nil)
- ret
- end
-
- # Saves LDAP configuration.
- # @param [Proc] abort block for abort
- # @return [Symbol]
- def Write(abort)
- abort = deep_copy(abort)
- # progress caption
- caption = _("Writing LDAP Configuration...")
- no_of_steps = 4
-
- Progress.New(
- caption,
- " ",
- no_of_steps,
- [
- # progress stage label
- _("Stop services"),
- # progress stage label
- _("Update configuration files"),
- # progress stage label
- _("Start services"),
- # progress stage label
- _("Update configuration in LDAP directory")
- ],
- [
- # progress step label
- _("Stopping services..."),
- # progress step label
- _("Updating configuration files..."),
- # progress step label
- _("Starting services..."),
- # progress step label
- _("Updating configuration in LDAP directory..."),
- # final progress step label
- _("Finished")
- ],
- ""
- )
-
- # -------------------- stop services
- Progress.NextStage
- return :abort if Builtins.eval(abort)
-
-
- # initialize 'oes' value when Read was not called (bnc#670288)
- CheckOES() if Mode.autoinst
-
- ypbind_running = false
-
- if !@write_only
- ypbind_running = Service.Status("ypbind") == 0
- Service.Stop("ypbind")
- elsif @write_only && Mode.autoinst
- # Read existing nsswitch in autoinstallation mode
- Builtins.foreach(["passwd", "group", "passwd_compat", "group_compat"]) do |db|
- Ops.set(@nsswitch, db, Nsswitch.ReadDb(db))
- end
- end
-
- # -------------------- update config files
- Progress.NextStage
- return :abort if Builtins.eval(abort)
-
- if @modified
- # update ldap.conf
- WriteLdapConfEntry("host", nil)
- uri = Builtins.mergestring(
- Builtins.maplist(Builtins.splitstring(@server, " \t")) do |u|
- Ops.add("ldap://", u)
- end,
- " "
- )
- WriteLdapConfEntry("uri", uri)
- WriteLdapConfEntry("base", @base_dn)
-
- if @member_attribute != @old_member_attribute
- WriteLdapConfEntries(
- "nss_map_attribute",
- ["uniqueMember", @member_attribute]
- )
- end
-
- WriteOpenLdapConf()
-
- if @ldap_tls
- WriteLdapConfEntry("ssl", "start_tls")
- else
- WriteLdapConfEntry("ssl", "no")
- end
-
- WriteLdapConfEntry(
- "tls_cacertdir",
- @tls_cacertdir == "" ? nil : @tls_cacertdir
- )
- WriteLdapConfEntry(
- "tls_cacertfile",
- @tls_cacertfile == "" ? nil : @tls_cacertfile
- )
-
- Pam.Set("mkhomedir", @mkhomedir)
-
- WriteLdapConfEntry("pam_password", @pam_password)
-
- # see bugs #suse37665 (pam_filter necessary), #118779 (not always)
- if ReadLdapConfEntry("pam_filter", "") == ""
- AddLdapConfEntry("pam_filter", "objectClass=posixAccount")
- end
-
- if @sssd
- WriteSSSDConfig()
- else
- # save the user and group bases
- @user_base = @base_dn
- @group_base = @base_dn
-
- WriteLdapConfEntry(
- "nss_base_passwd",
- @nss_base_passwd != @base_dn && @nss_base_passwd != "" ? @nss_base_passwd : nil
- )
- WriteLdapConfEntry(
- "nss_base_shadow",
- @nss_base_shadow != @base_dn && @nss_base_shadow != "" ? @nss_base_shadow : nil
- )
- WriteLdapConfEntry(
- "nss_base_group",
- @nss_base_group != @base_dn && @nss_base_group != "" ? @nss_base_group : nil
- )
- end
-
- # default value is 'yes'
- WriteLdapConfEntry(
- "tls_checkpeer",
- @tls_checkpeer == "yes" ? nil : @tls_checkpeer
- )
- WriteNscdCache(@start && @sssd)
- end
- if @start # ldap used for authentocation
- # ---------- correct pam_password value for Novell eDirectory
- if @pam_password != "nds" && @expert_ui
- CheckNDS() if !@nds_checked && !Mode.autoinst
- @pam_password = "nds" if @nds
- WriteLdapConfEntry("pam_password", @pam_password)
- end
-
-
- if !@oes
- if @sssd
- Pam.Add("sss")
- # Add "sss" to the passwd and group databases in nsswitch.conf
-
- Builtins.foreach(["passwd", "group"]) do |db|
- # replace 'ldap' with sss
- Ops.set(
- @nsswitch,
- db,
- Builtins.filter(Ops.get_list(@nsswitch, db, [])) do |v|
- v != "ldap"
- end
- )
- Ops.set(
- @nsswitch,
- db,
- Builtins.union(Ops.get_list(@nsswitch, db, []), ["sss"])
- )
- Nsswitch.WriteDb(
- db,
- Convert.convert(
- Ops.get(@nsswitch, db) { ["sss"] },
- :from => "any",
- :to => "list <string>"
- )
- )
- # remove 'ldap' from _compat entries
- new_db = Ops.add(db, "_compat")
- Ops.set(
- @nsswitch,
- new_db,
- Builtins.filter(Ops.get_list(@nsswitch, new_db, [])) do |v|
- v != "ldap"
- end
- )
- Nsswitch.WriteDb(new_db, Ops.get_list(@nsswitch, new_db, []))
- end
- # remove ldap entries from ldap-only db's
- Builtins.foreach(["services", "netgroup", "aliases"]) do |db|
- db_l = Builtins.filter(Nsswitch.ReadDb(db)) { |v| v != "ldap" }
- db_l = ["files"] if db_l == []
- Nsswitch.WriteDb(db, db_l)
- end
-
- if Pam.Enabled("krb5")
- Builtins.y2milestone(
- "configuring 'sss', so 'krb5' will be removed"
- )
- Pam.Remove("ldap-account_only")
- Pam.Remove("krb5")
- end
- Pam.Remove("ldap")
- else
- # pam settigs
- if Pam.Enabled("krb5")
- # If kerberos is used for authentication we configure
- # pam_ldap in a way that we use only the account checking.
- # Other configuration would mess up password changing
- Pam.Add("ldap-account_only")
- else
- Pam.Add("ldap")
- end
- # sss was removed, using pam_ldap (bnc#680184)
- Pam.Remove("sss") if Pam.Enabled("sss")
-
- # modify sources in /etc/nsswitch.conf
- Nsswitch.WriteDb("passwd", ["compat"])
- Nsswitch.WriteDb(
- "passwd_compat",
- Convert.convert(
- Builtins.union(
- Ops.get_list(@nsswitch, "passwd_compat", []),
- ["ldap"]
- ),
- :from => "list",
- :to => "list <string>"
- )
- )
-
- Builtins.foreach(["services", "netgroup", "aliases"]) do |db|
- Nsswitch.WriteDb(db, ["files", "ldap"])
- end
-
- if Builtins.contains(Ops.get_list(@nsswitch, "group", []), "compat") &&
- Builtins.contains(
- Ops.get_list(@nsswitch, "group_compat", []),
- "ldap"
- )
- Builtins.y2milestone("group_compat present, not changing")
- else
- Nsswitch.WriteDb("group", ["files", "ldap"])
- end
- end
-
- Nsswitch.Write
- end
- Autologin.Write(@write_only)
- elsif !@oes # ldap is not used
- Builtins.foreach(["passwd", "group"]) do |db|
- new_db = Ops.add(db, "_compat")
- Ops.set(
- @nsswitch,
- db,
- Builtins.filter(Ops.get_list(@nsswitch, db, [])) do |v|
- v != "ldap" && v != "sss"
- end
- )
- if Ops.get_list(@nsswitch, db, []) == [] ||
- Ops.get_list(@nsswitch, db, []) == ["files"]
- Ops.set(@nsswitch, db, ["compat"])
- end
- Ops.set(
- @nsswitch,
- new_db,
- Builtins.filter(Ops.get_list(@nsswitch, new_db, [])) do |v|
- v != "ldap" && v != "sss"
- end
- )
- Nsswitch.WriteDb(
- db,
- Convert.convert(
- Ops.get(@nsswitch, db) { ["compat"] },
- :from => "any",
- :to => "list <string>"
- )
- )
- Nsswitch.WriteDb(new_db, Ops.get_list(@nsswitch, new_db, []))
- end
- Builtins.foreach(["services", "netgroup", "aliases"]) do |db|
- db_l = Builtins.filter(Nsswitch.ReadDb(db)) do |v|
- v != "ldap" && v != "sss"
- end
- db_l = ["files"] if db_l == []
- Nsswitch.WriteDb(db, db_l)
- end
-
- Nsswitch.Write
-
- if Pam.Enabled("ldap")
- Pam.Remove("ldap")
- elsif Pam.Enabled("ldap-account_only")
- Pam.Remove("ldap-account_only")
- end
- Pam.Remove("sss") if Pam.Enabled("sss")
- end
-
-
- # write the changes in /etc/ldap.conf and /etc/openldap/ldap.conf now
- if !SCR.Write(path(".etc.ldap_conf"), nil)
- Builtins.y2error("error writing ldap.conf file")
- end
- SCR.UnmountAgent(path(".etc.ldap_conf")) if Stage.cont
-
- # write sysconfig values
- SCR.Write(
- path(".sysconfig.ldap.FILE_SERVER"),
- @file_server ? "yes" : "no"
- )
-
- SCR.Write(path(".sysconfig.ldap.BASE_CONFIG_DN"), @base_config_dn)
-
- SCR.Write(path(".sysconfig.ldap.BIND_DN"), @bind_dn)
-
- # write the changes in /etc/sysconfig/ldap now
- if !SCR.Write(path(".sysconfig.ldap"), nil)
- Builtins.y2error("error writing /etc/sysconfig/ldap")
- end
-
- if @_autofs_allowed
- if Nsswitch.WriteAutofs(@start && @_start_autofs, "ldap")
- if @_start_autofs
- Service.Adjust("autofs", "enable")
- else
- Service.Adjust("autofs", "disable")
- end
- end
- end
-
- WritePlusLine(@login_enabled) if @start && !@sssd
-
- # -------------------- start services
- Progress.NextStage
- return :abort if Builtins.eval(abort)
-
- if !@write_only
- if @sssd && @start
- # enable the sssd daemon to be started at bootup
- Service.Adjust("sssd", "enable")
- if Service.Status("sssd") == 0
- Service.Restart("sssd")
- else
- Service.Start("sssd")
- end
- else
- Service.Stop("sssd")
- Service.Adjust("sssd", "disable")
- end
-
- if Package.Installed("nscd") && @modified
- SCR.Execute(path(".target.bash"), "/usr/sbin/nscd -i passwd")
- SCR.Execute(path(".target.bash"), "/usr/sbin/nscd -i group")
- Service.RunInitScript("nscd", "try-restart")
- end
-
- if Package.Installed("zmd") && Service.Status("novell-zmd") == 0
- Service.RunInitScript("novell-zmd", "try-restart")
- end
-
- Service.Restart("ypbind") if ypbind_running
-
- Service.Restart("sshd") if @restart_sshd
-
- if @_autofs_allowed
- Service.Stop("autofs")
-
- Service.Start("autofs") if @_start_autofs
- end
- # after finish of 2nd stage, restart running services (bnc#395402)
- if @start && Stage.cont
- services = []
- Builtins.foreach(["dbus", "haldaemon"]) do |service|
- if Service.Status(service) == 0
- services = Builtins.add(services, service)
- end
- end
- if Ops.greater_than(Builtins.size(services), 0)
- Builtins.y2milestone("services %1 will be restarted", services)
- SCR.Write(
- path(".target.string"),
- Ops.add(Directory.vardir, "/restart_services"),
- Ops.add(Builtins.mergestring(services, "\n"), "\n")
- )
- end
- end
- elsif @sssd
- # enable the sssd daemon to be started at bootup
- Service.Adjust("sssd", @start ? "enable" : "disable")
- end
-
- # -------------------- write settings to LDAP
- Progress.NextStage
- return :abort if Builtins.eval(abort)
-
- # ------------------------------ create the LDAP configuration (#40484)
- ldap_ok = true
- if @create_ldap && !Mode.autoinst
- ldap_ok = CreateDefaultLDAPConfiguration()
- end
-
- if @ldap_modified && ldap_ok
- CheckOrderOfCreation()
-
- if WriteLDAP(@templates) && WriteLDAP(@config_modules)
- @ldap_modified = false
- end
- end
-
- # final stage
- Progress.NextStage
-
- # unbind is done in agent destructor
- # ldap-client can be called more times from users module so we
- # will have to know it is necessary to bind again
- @bound = false
- if @modified
- @ldap_initialized = false
- @old_server = @server
- @old_base_dn = @base_dn
- end
- if @ldap_modified
- @config_modules = {}
- @templates = {}
- end
-
- # now clear the initial default values, so next time Read will read
- # real values
- if Stage.cont && Ops.greater_than(Builtins.size(@initial_defaults), 0)
- first_s = GetFirstServer(@server)
- if @start && ldap_ok &&
- @base_dn == Ops.get_string(@initial_defaults, "ldap_domain", "") &&
- (first_s == Ops.get_string(@initial_defaults, "ldap_server", "") ||
- DNS.IsHostLocal(first_s))
- @initial_defaults_used = true
- Builtins.y2milestone("initial defaults were used")
- end
- @initial_defaults = {}
- end
-
- :next
- end
-
- # wrapper for Write, without abort block
- def WriteNow
- abort = lambda { false }
-
- needed_packages = @sssd ? @sssd_packages : @pam_nss_packages
- if @sssd_with_krb
- needed_packages = Convert.convert(
- Builtins.union(needed_packages, @kerberos_packages),
- :from => "list",
- :to => "list <string>"
- )
- end
-
- if @_start_autofs && !Package.Installed("autofs")
- needed_packages = Builtins.add(needed_packages, "autofs")
- end
-
- if @start && !Package.InstalledAll(needed_packages)
- if !Package.InstallAll(needed_packages)
- Report.Error(Message.FailedToInstallPackages)
- end
- @start = false
- @_start_autofs = false
- end
- # during CLI call nss_base_* are not edited: adapt them to new base DN
- if @old_base_dn != @base_dn && @nss_base_passwd == @old_base_dn
- @nss_base_passwd = @base_dn
- @nss_base_shadow = @base_dn
- @nss_base_group = @base_dn
- end
-
- Write(abort) == :next
- end
-
# Check if base config DN belongs to some existing object and offer
# creating it if necessary
@@ -3086,13 +2193,6 @@
nil
end
- # Set the value of restart_sshd (= restart sshd during write)
- def RestartSSHD(restart)
- @restart_sshd = restart
-
- nil
- end
-
# Get RDN (relative distinguished name) from dn
def get_rdn(dn)
dn_list = Builtins.splitstring(dn, ",")
@@ -3110,7 +2210,7 @@
# Create DN from cn by adding base config DN
# (Can't work in general cases!)
def get_dn(cn)
- Builtins.sformat("cn=%1,%2", cn, Ldap.base_config_dn)
+ Builtins.sformat("cn=%1,%2", cn, @base_config_dn)
end
# Create new DN from DN by changing leading cn value
@@ -3225,13 +2325,7 @@
publish :function => :SetDomain, :type => "void (string)"
publish :function => :SetDefaults, :type => "boolean (map)"
publish :function => :SetReadSettings, :type => "boolean (boolean)"
- publish :function => :AutoPackages, :type => "map ()"
- publish :function => :Set, :type => "void (map)"
- publish :function => :Import, :type => "boolean (map)"
publish :function => :Export, :type => "map ()"
- publish :function => :Summary, :type => "string ()"
- publish :function => :ShortSummary, :type => "string ()"
- publish :function => :ReadKrb5Conf, :type => "boolean ()"
publish :function => :ReadLdapConfEntry, :type => "string (string, string)", :private => true
publish :function => :ReadLdapConfEntries, :type => "list <string> (string)", :private => true
publish :function => :WriteLdapConfEntry, :type => "void (string, string)", :private => true
@@ -3284,20 +2378,21 @@
publish :function => :CommitTemplates, :type => "boolean (map)"
publish :function => :WriteToLDAP, :type => "map (map)"
publish :function => :WriteLDAP, :type => "boolean (map)"
- publish :function => :WriteOpenLdapConf, :type => "boolean ()"
- publish :function => :WriteSSSDConfig, :type => "boolean ()"
publish :function => :WritePlusLine, :type => "boolean (boolean)"
publish :function => :CheckOrderOfCreation, :type => "boolean ()"
publish :function => :CreateDefaultLDAPConfiguration, :type => "boolean ()", :private => true
publish :function => :CheckNDS, :type => "boolean ()"
- publish :function => :WriteNscdCache, :type => "boolean (boolean)", :private => true
publish :function => :Write, :type => "symbol (block <boolean>)"
publish :function => :WriteNow, :type => "boolean ()"
publish :function => :CheckBaseConfig, :type => "boolean (string)"
publish :function => :SetBindPassword, :type => "void (string)"
publish :function => :SetAnonymous, :type => "void (boolean)"
publish :function => :SetGUI, :type => "void (boolean)"
- publish :function => :RestartSSHD, :type => "void (boolean)"
+ publish :function => :get_rdn, :type => "string (string)"
+ publish :function => :get_cn, :type => "string (string)"
+ publish :function => :get_dn, :type => "string (string)"
+ publish :function => :get_new_dn, :type => "string (string)"
+ publish :function => :get_string, :type => "string (string)"
end
Ldap = LdapClass.new
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.5/src/ldap_browser.rb new/yast2-ldap-3.1.6/src/ldap_browser.rb
--- old/yast2-ldap-3.1.5/src/ldap_browser.rb 2014-02-11 17:50:19.000000000 +0100
+++ new/yast2-ldap-3.1.6/src/ldap_browser.rb 2014-02-13 17:53:16.000000000 +0100
@@ -96,7 +96,7 @@
Ldap.Read
@configurations = []
- @configurations_file = Ops.add(Directory.vardir, "/ldap_servers.ycp")
+ @configurations_file.push("/ldap_servers.ycp")
# combobox item
@default_name = _("Current LDAP Client settings")
@configuration = {
@@ -143,15 +143,13 @@
InputField(
Id("server"),
Opt(:hstretch, :notify),
- _("LDAP Server"),
- Ops.get_string(@configuration, "server", "")
+ _("LDAP Server"),@configuration["server"]
),
InputField(
Id("bind_dn"),
Opt(:hstretch, :notify),
# textentry label
- _("Administrator DN"),
- Ops.get_string(@configuration, "bind_dn", "")
+ _("Administrator DN"),@configuration["bind_dn"]
),
# password entering label
Password(Id("pw"), Opt(:hstretch), _("&LDAP Server Password")),
@@ -161,8 +159,7 @@
CheckBox(
Id("ldap_tls"),
Opt(:notify),
- _("L&DAP TLS"),
- Ops.get_boolean(@configuration, "ldap_tls", false)
+ _("L&DAP TLS"),@configuration["ldap_tls"]
)
),
ButtonBox(
continue with "q"...
Checked in at Fri Feb 14 14:00:55 CET 2014 by ro
Remember to have fun...
--
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] Request 32760 changed to accepted (submit SUSE:SLE-12:GA/yast2-cio)
by Ruediger Oertel 14 Feb '14
by Ruediger Oertel 14 Feb '14
14 Feb '14
Visit https://build.suse.de/request/show/32760
State of request 32760 was changed by oertel:
new -> accepted
Comment:
Accepted submit request 32760 from user leonardocf
Actions:
- submit Devel:YaST:Head/yast2-cio => SUSE:SLE-12:GA/yast2-cio
--
Configure notifications at https://build.suse.de/user/notifications
SUSE Internal OBS Instance (https://build.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