Hello community,
here is the log from the commit of package yast2-users
checked in at Mon Sep 25 23:09:44 CEST 2006.
--------
--- yast2-users/yast2-users.changes 2006-09-21 16:09:24.000000000 +0200
+++ yast2-users/yast2-users.changes 2006-09-25 16:02:32.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 25 15:45:43 CEST 2006 - jsuchome@suse.cz
+
+- do not offer importing users when there are not available (#207973)
+- 2.13.30
+
+-------------------------------------------------------------------
Old:
----
yast2-users-2.13.29.tar.bz2
New:
----
yast2-users-2.13.30.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-users.spec ++++++
--- /var/tmp/diff_new_pack.fCLkqa/_old 2006-09-25 23:08:28.000000000 +0200
+++ /var/tmp/diff_new_pack.fCLkqa/_new 2006-09-25 23:08:28.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-users (Version 2.13.29)
+# spec file for package yast2-users (Version 2.13.30)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-users
-Version: 2.13.29
+Version: 2.13.30
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-users-2.13.29.tar.bz2
+Source0: yast2-users-2.13.30.tar.bz2
prefix: /usr
BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client yast2-mail-aliases yast2-perl-bindings yast2-security yast2-testsuite
Requires: yast2 yast2-perl-bindings yast2-country yast2-pam yast2-security yast2-mail-aliases cracklib perl-Digest-SHA1 perl-gettext yast2-ldap-client
@@ -42,7 +42,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-users-2.13.29
+%setup -n yast2-users-2.13.30
%build
%{prefix}/bin/y2tool y2autoconf
@@ -85,6 +85,9 @@
%doc %{prefix}/share/doc/packages/yast2-users
%changelog -n yast2-users
+* Mon Sep 25 2006 - jsuchome@suse.cz
+- do not offer importing users when there are not available (#207973)
+- 2.13.30
* Thu Sep 21 2006 - jsuchome@suse.cz
- setup Kerberos During Installation (F120214)
- 2.13.29
++++++ yast2-users-2.13.29.tar.bz2 -> yast2-users-2.13.30.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.13.29/VERSION new/yast2-users-2.13.30/VERSION
--- old/yast2-users-2.13.29/VERSION 2006-09-21 15:55:43.000000000 +0200
+++ new/yast2-users-2.13.30/VERSION 2006-09-25 15:46:16.000000000 +0200
@@ -1 +1 @@
-2.13.29
+2.13.30
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.13.29/src/Users.pm new/yast2-users-2.13.30/src/Users.pm
--- old/yast2-users-2.13.29/src/Users.pm 2006-09-21 14:06:07.000000000 +0200
+++ new/yast2-users-2.13.30/src/Users.pm 2006-09-21 16:11:08.000000000 +0200
@@ -4,7 +4,7 @@
# Package: Configuration of users and groups
# Summary: I/O routines + main data structures
#
-# $Id: Users.pm 32992 2006-09-20 07:47:28Z jsuchome $
+# $Id: Users.pm 33027 2006-09-21 14:12:41Z jsuchome $
#
package Users;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.13.29/src/inst_auth.ycp new/yast2-users-2.13.30/src/inst_auth.ycp
--- old/yast2-users-2.13.29/src/inst_auth.ycp 2006-09-21 15:54:46.000000000 +0200
+++ new/yast2-users-2.13.30/src/inst_auth.ycp 2006-09-25 15:43:01.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Arvin Schnell
* Michal Svec
*
- * $Id: inst_auth.ycp 32992 2006-09-20 07:47:28Z jsuchome $
+ * $Id: inst_auth.ycp 33027 2006-09-21 14:12:41Z jsuchome $
*/
{
@@ -107,7 +107,6 @@
}
boolean import_available = false;
-boolean imported = false;
string import_dir = Directory::vardir + "/imported/userdata/etc";
string base_dir = Users::GetBaseDirectory ();
list<string> user_names = [];
@@ -122,6 +121,30 @@
}
}
+if (import_available)
+{
+ Users::SetBaseDirectory (import_dir);
+ string err = Users::ReadLocal ();
+ if (err != "")
+ {
+ y2warning ("Error during reading: %1", err);
+ }
+ else
+ {
+ UsersCache::Read ();
+ user_names = UsersCache::GetUsernames ("local");
+ }
+ if (size (user_names) < 1)
+ {
+ y2milestone ("No users to import");
+ import_available = false;
+ foreach (string file, [ "/passwd", "/shadow", "/group" ], {
+ SCR::Execute (.target.remove, import_dir + file);
+ });
+ }
+ Users::SetBaseDirectory (base_dir);
+}
+
// caption for dialog "User Authentication Method"
string caption = _("User Authentication Method");
@@ -289,15 +312,6 @@
}
if (ret == `import)
{
- if (!imported)
- {
- Users::SetBaseDirectory (import_dir);
- string err = Users::ReadLocal ();
- UsersCache::Read ();
- user_names = UsersCache::GetUsernames ("local");
- imported = true;
- Users::SetBaseDirectory (base_dir);
- }
list<string> selected = choose_to_import (user_names, to_import);
if (selected != nil)
to_import = selected;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.13.29/src/inst_user.ycp new/yast2-users-2.13.30/src/inst_user.ycp
--- old/yast2-users-2.13.29/src/inst_user.ycp 2006-09-21 15:14:00.000000000 +0200
+++ new/yast2-users-2.13.30/src/inst_user.ycp 2006-09-21 16:11:08.000000000 +0200
@@ -6,7 +6,7 @@
*
* Purpose: Start user management module from within installation workflow
*
- * $Id: inst_user.ycp 32954 2006-09-18 15:59:33Z jsuchome $
+ * $Id: inst_user.ycp 33027 2006-09-21 14:12:41Z jsuchome $
*/
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org