Attachment 176339 Details for Bug 328298

[patch] alternative version of the patch

kiwi2.diff (text/plain), 3.43 KB, created by Jiří Suchomel on 2007-10-04 13:52:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiří Suchomel

Created: 2007-10-04 13:52:58 UTC

Size: 3.43 KB

patch

obsolete

>--- /usr/sbin/kiwi.bak	2007-10-04 15:38:48.000000000 +0200
>+++ /usr/sbin/kiwi	2007-10-04 15:39:32.000000000 +0200
>@@ -104,6 +104,7 @@
> our $ListProfiles;      # lists the available profiles in image
> our $ForceNewRoot;      # force creation of new root directory
> our $BaseRoot;          # use given path as base system
>+our $nocolor;		# do not used colored output (done/failed messages)
> 
> #============================================
> # Globals
>@@ -135,6 +136,17 @@
> 	#------------------------------------------
> 	init();
> 
>+	
>+	#==========================================
>+	# Check for nocolor option (doesn't make sense with LogFile set)
>+	#------------------------------------------
>+	if (defined $nocolor) {
>+		$kiwi -> info ("Switching off colored output\n");
>+		if (! $kiwi -> setColorOff ()) {
>+			my $code = kiwiExit (1); return $code;
>+		}
>+	}
>+
> 	#==========================================
> 	# Setup logging location
> 	#------------------------------------------
>@@ -144,7 +156,6 @@
> 			my $code = kiwiExit (1); return $code;
> 		}
> 	}
>-
> 	#==========================================
> 	# Handle ListProfiles option
> 	#------------------------------------------
>@@ -739,6 +750,7 @@
> 		"force-new-root"        => \$ForceNewRoot,
> 		"base-root=s"           => \$BaseRoot,
> 		"help|h"                => \&usage,
>+		"nocolor"		=> \$nocolor,
> 		"<>"                    => \&usage
> 	);
> 	my $user = qx (whoami);
>--- /usr/share/kiwi/modules/KIWILog.pm.bak	2007-10-04 15:38:55.000000000 +0200
>+++ /usr/share/kiwi/modules/KIWILog.pm	2007-10-04 15:49:56.000000000 +0200
>@@ -189,7 +189,7 @@
> 	# This is the green "done" flag
> 	# ---
> 	my $this = shift;
>-	if (! defined $this->{fileLog}) {
>+	if (! defined $this->{fileLog} && !defined $this->{nocolor}) {
> 	    $this -> doStat();
> 		$this -> setOutputChannel();
> 		print "\033[1;32mdone\n";
>@@ -214,7 +214,7 @@
> 	# This is the red "failed" flag
> 	# ---
> 	my $this = shift;
>-	if (! defined $this->{fileLog}) {
>+	if (! defined $this->{fileLog} && !defined $this->{nocolor}) {
> 		$this -> doStat();
> 		$this -> setOutputChannel();
> 		print "\033[1;31mfailed\n";
>@@ -239,7 +239,7 @@
> 	# This is the yellow "skipped" flag
> 	# ---
> 	my $this = shift;
>-	if (! defined $this->{fileLog}) {
>+	if (! defined $this->{fileLog} && !defined $this->{nocolor}) {
> 		$this -> doStat();
> 		$this -> setOutputChannel();
> 		print "\033[1;33mskipped\n";
>@@ -268,7 +268,7 @@
> 	if ($data > 100) {
> 		$data = 100;
> 	}
>-	if (! defined $this->{fileLog}) {
>+	if (! defined $this->{fileLog} && !defined $this->{nocolor}) {
> 		$this -> doStat();
> 		$this -> setOutputChannel();
> 		print "\033[1;32m($data%)";
>@@ -287,7 +287,7 @@
> #------------------------------------------
> sub cursorOFF {
> 	my $this = shift;
>-	if (! defined $this->{fileLog}) {
>+	if (! defined $this->{fileLog} && !defined $this->{nocolor}) {
> 		print "\033[?25l";
> 	}
> }
>@@ -297,7 +297,7 @@
> #------------------------------------------
> sub cursorON {
> 	my $this = shift;
>-	if (! defined $this->{fileLog}) {
>+	if (! defined $this->{fileLog}  && !defined $this->{nocolor}) {
> 		print "\033[?25h";
> 	}
> }
>@@ -507,6 +507,18 @@
> }
> 
> #==========================================
>+# setColorOff
>+#------------------------------------------
>+sub setColorOff {
>+	# ...
>+	# switch off the colored output - do it by simulating output file
>+	# ---
>+	my $this = shift;
>+	$this->{nocolor} = 1;
>+	return $this;
>+}
>+
>+#==========================================
> # setRootLog
> #------------------------------------------
> sub setRootLog {

Actions: View | Diff

Attachments on bug 328298: 174707 | 175710 | 176338 | 176339