Attachment 176338 Details for Bug 328298

[patch] patch

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

(hide)

Description:

Filename:

MIME Type:

Creator: Jiří Suchomel

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

Size: 1.95 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:42:55.000000000 +0200
>@@ -507,6 +507,18 @@
> }
> 
> #==========================================
>+# setColorOff
>+#------------------------------------------
>+sub setColorOff {
>+	# ...
>+	# switch off the colored output - do it by simulating output file
>+	# ---
>+	my $this = shift;
>+	$this->{fileLog} = 1;
>+	return $this;
>+}
>+
>+#==========================================
> # setRootLog
> #------------------------------------------
> sub setRootLog {

Actions: View | Diff

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