Hello community,
here is the log from the commit of package yast2-users
checked in at Mon Dec 1 18:15:16 CET 2008.
--------
--- yast2-users/yast2-users.changes 2008-11-25 13:27:27.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-users/yast2-users.changes 2008-12-01 15:57:53.448713000 +0100
@@ -1,0 +2,8 @@
+Mon Dec 1 15:51:14 CET 2008 - jsuchome@suse.cz
+
+- do not open user dialogs in 2nd stage if user was configured
+ before (bnc#450231)
+- check for network before checking for network methods (bnc#450469)
+- 2.17.27
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-users-2.17.26.tar.bz2
New:
----
yast2-users-2.17.27.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-users.spec ++++++
--- /var/tmp/diff_new_pack.G20527/_old 2008-12-01 18:14:58.000000000 +0100
+++ /var/tmp/diff_new_pack.G20527/_new 2008-12-01 18:14:58.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-users (Version 2.17.26)
+# spec file for package yast2-users (Version 2.17.27)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-users
-Version: 2.17.26
+Version: 2.17.27
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-users-2.17.26.tar.bz2
+Source0: yast2-users-2.17.27.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-perl-bindings yast2-security yast2-testsuite
Requires: yast2-perl-bindings yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext
@@ -52,7 +52,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-users-2.17.26
+%setup -n yast2-users-2.17.27
%build
%{prefix}/bin/y2tool y2autoconf
@@ -95,6 +95,11 @@
%{_libdir}/YaST2/plugin/libpy2ag_crack.la
%doc %{prefix}/share/doc/packages/yast2-users
%changelog
+* Mon Dec 01 2008 jsuchome@suse.cz
+- do not open user dialogs in 2nd stage if user was configured
+ before (bnc#450231)
+- check for network before checking for network methods (bnc#450469)
+- 2.17.27
* Tue Nov 25 2008 jsuchome@suse.cz
- installation: do not reset root password when modifying 1st user
settings (bnc#445512)
++++++ yast2-users-2.17.26.tar.bz2 -> yast2-users-2.17.27.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.26/src/inst_user_first.ycp new/yast2-users-2.17.27/src/inst_user_first.ycp
--- old/yast2-users-2.17.26/src/inst_user_first.ycp 2008-11-25 13:26:49.000000000 +0100
+++ new/yast2-users-2.17.27/src/inst_user_first.ycp 2008-11-25 13:27:54.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialog for creating the first user during installation
* Authors: Jiri Suchomel
*
- * $Id: inst_user_first.ycp 52648 2008-10-29 08:25:41Z jsuchome $
+ * $Id: inst_user_first.ycp 53573 2008-11-25 12:27:53Z jsuchome $
*/
{
import "Arch";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.26/src/inst_user.ycp new/yast2-users-2.17.27/src/inst_user.ycp
--- old/yast2-users-2.17.26/src/inst_user.ycp 2008-07-21 16:08:42.000000000 +0200
+++ new/yast2-users-2.17.27/src/inst_user.ycp 2008-12-01 15:03:41.000000000 +0100
@@ -33,6 +33,11 @@
list<map> users = [];
mapuser = $[];
+ if (UsersSimple::UserCreationSkipped ())
+ {
+ y2milestone ("preconfigured user already written...");
+ return `auto;
+ }
if (!GetInstArgs::going_back())
{
Users::ReadSystemDefaults (false);
@@ -50,6 +55,7 @@
});
}
}
+
// what to call after inst_auth dialog
string client = UsersSimple::AfterAuth();
@@ -95,6 +101,7 @@
y2error ("error while creating user: %1", error);
Progress::set (progress_orig);
UsersSimple::RemoveUserData ();
+ UsersSimple::SkipUserCreation (true);
return `next;
}
if (Mode::normal ()) Wizard::CreateDialog (); // for testing only
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.26/src/users_proposal.ycp new/yast2-users-2.17.27/src/users_proposal.ycp
--- old/yast2-users-2.17.26/src/users_proposal.ycp 2008-11-25 10:36:21.000000000 +0100
+++ new/yast2-users-2.17.27/src/users_proposal.ycp 2008-11-25 13:27:54.000000000 +0100
@@ -3,7 +3,7 @@
* Author: Jiri Suchomel
* Purpose: Proposal for user and root setting
*
- * $Id: users_proposal.ycp 49567 2008-08-01 10:01:55Z jsuchome $
+ * $Id: users_proposal.ycp 53573 2008-11-25 12:27:53Z jsuchome $
*/
{
textdomain "users";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.26/src/UsersSimple.pm new/yast2-users-2.17.27/src/UsersSimple.pm
--- old/yast2-users-2.17.26/src/UsersSimple.pm 2008-11-13 08:31:36.000000000 +0100
+++ new/yast2-users-2.17.27/src/UsersSimple.pm 2008-12-01 15:30:20.000000000 +0100
@@ -105,6 +105,9 @@
# prevent re-reading data map with 1st stage settingss
my $first_stage_data_not_read = 1;
+# note if users configuration should be run or skipped in 2nd stage (bnc#450231)
+my $skip_user_creation = 0;
+
##------------------------------------
##------------------- global imports
@@ -113,6 +116,7 @@
YaST::YCP::Import ("Hostname");
YaST::YCP::Import ("InstExtensionImage");
YaST::YCP::Import ("Mode");
+YaST::YCP::Import ("NetworkService");
YaST::YCP::Import ("ProductControl");
YaST::YCP::Import ("SCR");
YaST::YCP::Import ("Stage");
@@ -323,7 +327,18 @@
$run_krb_config = bool ($krb) if (defined $krb);
}
-
+# note if users configuration should be run in 2nd stage
+BEGIN { $TYPEINFO{SkipUserCreation} = ["function", "void", "boolean"];}
+sub SkipUserCreation {
+ my ($self, $skip) = @_;
+ $skip_user_creation = bool ($skip);
+}
+
+# return the value of skip_user_creation
+BEGIN { $TYPEINFO{UserCreationSkipped} = ["function", "boolean"];}
+sub UserCreationSkipped {
+ return bool ($skip_user_creation);
+}
##------------------------------------
# Returns the map of user configured during installation
@@ -1210,6 +1225,11 @@
return $network_methods_checked if $network_methods_checked;
+ if (!NetworkService->isNetworkRunning()) {
+ y2milestone ("network is not running, skipping network methods test");
+ return 0;
+ }
+
my $call_extend = Stage->initial () && !Mode->live_installation ();
if ($call_extend && !InstExtensionImage->LoadExtension ("bind",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.26/VERSION new/yast2-users-2.17.27/VERSION
--- old/yast2-users-2.17.26/VERSION 2008-11-25 10:39:37.000000000 +0100
+++ new/yast2-users-2.17.27/VERSION 2008-12-01 15:52:32.000000000 +0100
@@ -1 +1 @@
-2.17.26
+2.17.27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org