Attachment 197663 Details for Bug 365547

[patch] patch for /usr/share/YaST2/modules/UsersRoutines.pm

UsersRoutines.diff (text/plain), 3.02 KB, created by Jiří Suchomel on 2008-02-28 13:38:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiří Suchomel

Created: 2008-02-28 13:38:12 UTC

Size: 3.02 KB

patch

obsolete

>Index: UsersRoutines.pm
>===================================================================
>--- UsersRoutines.pm	(revision 41076)
>+++ UsersRoutines.pm	(working copy)
>@@ -342,7 +342,7 @@
> 	SCR->Execute (".target.bash", "/bin/rm -rf $mnt_dir") if (FileUtils->Exists ($mnt_dir));
> 	SCR->Execute (".target.mkdir", $mnt_dir);
> 	$command = "mount -o loop $image_path $mnt_dir";
>-	y2debug ("cmd: $command");
>+	y2internal ("cmd: $command");
> 	$out = SCR->Execute (".target.bash_output", $command);
> 	if ($out->{"exit"} ne 0 && $out->{"stderr"}) {
> 	    y2error ("error calling $command: ", $out->{"stderr"}); 
>@@ -352,21 +352,21 @@
> 	SCR->Execute (".target.bash", "/bin/rm -rf $home");
> 	# copy the directory content
> 	$command = "/bin/cp -ar $mnt_dir $home";
>-	y2debug ("cmd: $command");
>+	y2internal ("cmd: $command");
> 	$out	= SCR->Execute (".target.bash_output", $command);
> 	if ($out->{"exit"} ne 0 && $out->{"stderr"}) {
> 	    y2error ("error calling $command: ", $out->{"stderr"});
> 	    return 0;
> 	}
> 	$command = "umount $mnt_dir";
>-	y2debug ("cmd: $command");
>+	y2internal ("cmd: $command");
> 	$out = SCR->Execute (".target.bash_output", $command);
> 	if ($out->{"exit"} ne 0 && $out->{"stderr"}) {
> 	    y2error ("error calling $command: ", $out->{"stderr"}); 
> 	    return 0;
> 	}
> 	$command = "$cryptconfig pm-disable $username";
>-	y2debug ("cmd: $command");
>+	y2internal ("cmd: $command");
> 	$out	= SCR->Execute (".target.bash_output", $command);
> 	if ($out->{"exit"} ne 0 && $out->{"stderr"}) {
> 	    y2error ("error calling $command: ", $out->{"stderr"});
>@@ -374,7 +374,7 @@
> 	    return 0;
> 	}
> 	$command = "$cryptconfig close $org_img";
>-	y2debug ("cmd: $command");
>+	y2internal ("cmd: $command");
> 	$out	= SCR->Execute (".target.bash_output", $command);
> 	if ($out->{"exit"} ne 0 && $out->{"stderr"}) {
> 	    y2error ("error calling $command: ", $out->{"stderr"});
>@@ -419,7 +419,7 @@
> 	$cmd = $cmd."--key-file=$key_file " if defined $key_file;
> 	$cmd = $cmd."--image-file=$image_file " if defined $image_file;
> 	$cmd = $cmd."$username";
>-	y2debug ("cmd: $cmd");
>+	y2internal ("cmd: $cmd");
> 	my $out = SCR->Execute (".target.bash_output", $cmd);
> 	if ($out->{"exit"} ne 0 && $out->{"stderr"}) {
> 	    Report->Error ($out->{"stderr"});
>@@ -436,7 +436,7 @@
>     if ($modified eq "edited" && defined $key_file && defined $new_pw && $new_pw ne $pw) {
> 	SCR->Write (".target.string", $pw_path, "$pw\n$new_pw");
> 	my $command = "$cryptconfig passwd --no-verify $key_file < $pw_path";
>-	y2debug ("cmd: $command");
>+	y2internal ("cmd: $command");
> 	my $out	= SCR->Execute (".target.bash_output", $command);
> 	if ($out->{"exit"} ne 0) {
> 	    y2error ("error calling $command");
>@@ -459,12 +459,12 @@
>     }
>     # ok, only password change was needed
>     else {
>-	y2debug ("nothing to do");
>+	y2internal ("nothing to do");
> 	SCR->Execute (".target.remove", $pw_path);
> 	return 1;
>     }
> 
>-    y2debug ("cmd: $cmd");
>+    y2internal ("cmd: $cmd");
>     $out = SCR->Execute (".target.bash_output", $cmd);
>     if ($out->{"exit"} ne 0 && $out->{"stderr"}) {
> 	Report->Error ($out->{"stderr"});

Actions: View | Diff

Attachments on bug 365547: 197644 | 197663 | 197670