aboutsummaryrefslogtreecommitdiffstats
path: root/userdrake
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-08-24 21:12:19 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-08-24 21:12:19 +0000
commit359a5f7745a1f18774414c94c54b23ad47fd8c1a (patch)
tree0b2a49ff8bd4d777cd7e847d422407140c5a607f /userdrake
parent212fd0cede92bfa6d86342caf4c5df7d52c2354c (diff)
downloaduserdrake-359a5f7745a1f18774414c94c54b23ad47fd8c1a.tar
userdrake-359a5f7745a1f18774414c94c54b23ad47fd8c1a.tar.gz
userdrake-359a5f7745a1f18774414c94c54b23ad47fd8c1a.tar.bz2
userdrake-359a5f7745a1f18774414c94c54b23ad47fd8c1a.tar.xz
userdrake-359a5f7745a1f18774414c94c54b23ad47fd8c1a.zip
fix #4871: proplerly use explanations
Diffstat (limited to 'userdrake')
-rwxr-xr-xuserdrake13
1 files changed, 7 insertions, 6 deletions
diff --git a/userdrake b/userdrake
index fc0a1ae..8cdfbb1 100755
--- a/userdrake
+++ b/userdrake
@@ -35,6 +35,7 @@ use USER;
#Only for Debugging
#use Devel::Peek;
use Gtk2::Gdk::Keysyms;
+use log;
my $conffile = '/etc/sysconfig/userdrake';
my $secfile = '/etc/sysconfig/msec';
@@ -303,13 +304,13 @@ sub AddUser {
$u{gid} = $gr->Gid($GetValue);
} elsif ($groupchoice == 1) {
# Put it in 'users' group
- explanations(N("Putting %s to 'users' group", $u{username}));
+ log::explanations(N("Putting %s to 'users' group", $u{username}));
$u{gid} = Add2UsersGroup($u{username});
}
} else {
#it's a new group: Add it
my $newgroup = $ctx->InitGroup($u{username},$is_system);
- explanations(N("Creating new group: %s", $newgroup));
+ log::explanations(N("Creating new group: %s", $newgroup));
$u{gid} = $newgroup->Gid($GetValue);
$ctx->GroupAdd($newgroup);
}
@@ -318,7 +319,7 @@ sub AddUser {
!$error and $u{gid} = Add2UsersGroup($u{username});
}
if(!$error) {
- explanations(N("Adding user : %s", $u{username}));
+ log::explanations(N("Adding user : %s", $u{username}));
$u{gecos} = $us->{o}->{fullname}->get_text(); $u{loginshell} = $us->{o}->{shells}->entry->get_text();
$userEnt->Gecos($u{gecos}); $userEnt->LoginShell($u{loginshell}); $userEnt->Gid($u{gid});
$userEnt->ShadowMin(-1); $userEnt->ShadowMax(99999);
@@ -416,7 +417,7 @@ sub AddGroup {
} else { $groupEnt->Gid($g{gid}) }
};
if(!$error) {
- explanations(N("Adding group : %s ", $g{groupname}));
+ log::explanations(N("Adding group : %s ", $g{groupname}));
$ctx->GroupAdd($groupEnt);
Refresh($sysfilter, $stringsearch);
}
@@ -486,7 +487,7 @@ sub Delete {
my $r = $_->[1];
gtksignal_connect(Gtk2::Button->new_from_stock($_->[0]), clicked => sub {
if (!$r) {
- explanations(N("Removing user: %s", $username));
+ log::explanations(N("Removing user: %s", $username));
$ctx->UserDel($userEnt);
UpdateOrDelUsersInGroup($username, 1);
#Let's check out the user's primary group
@@ -526,7 +527,7 @@ sub Delete {
}
}
if (!$error) {
- explanations(N("Removing group: %s", $groupname));
+ log::explanations(N("Removing group: %s", $groupname));
$ctx->GroupDel($groupEnt); Refresh($sysfilter, $stringsearch) }
}
!$error and Gtk2->main_quit; $error = 0; })