View | Details | Raw Unified | Return to bug 328298
Collapse All | Expand All

(-)/usr/sbin/kiwi.bak (-1 / +13 lines)
Lines 104-109 Link Here
104
our $ListProfiles;      # lists the available profiles in image
104
our $ListProfiles;      # lists the available profiles in image
105
our $ForceNewRoot;      # force creation of new root directory
105
our $ForceNewRoot;      # force creation of new root directory
106
our $BaseRoot;          # use given path as base system
106
our $BaseRoot;          # use given path as base system
107
our $nocolor;		# do not used colored output (done/failed messages)
107
108
108
#============================================
109
#============================================
109
# Globals
110
# Globals
Lines 135-140 Link Here
135
	#------------------------------------------
136
	#------------------------------------------
136
	init();
137
	init();
137
138
139
	
140
	#==========================================
141
	# Check for nocolor option (doesn't make sense with LogFile set)
142
	#------------------------------------------
143
	if (defined $nocolor) {
144
		$kiwi -> info ("Switching off colored output\n");
145
		if (! $kiwi -> setColorOff ()) {
146
			my $code = kiwiExit (1); return $code;
147
		}
148
	}
149
138
	#==========================================
150
	#==========================================
139
	# Setup logging location
151
	# Setup logging location
140
	#------------------------------------------
152
	#------------------------------------------
Lines 144-150 Link Here
144
			my $code = kiwiExit (1); return $code;
156
			my $code = kiwiExit (1); return $code;
145
		}
157
		}
146
	}
158
	}
147
148
	#==========================================
159
	#==========================================
149
	# Handle ListProfiles option
160
	# Handle ListProfiles option
150
	#------------------------------------------
161
	#------------------------------------------
Lines 739-744 Link Here
739
		"force-new-root"        => \$ForceNewRoot,
750
		"force-new-root"        => \$ForceNewRoot,
740
		"base-root=s"           => \$BaseRoot,
751
		"base-root=s"           => \$BaseRoot,
741
		"help|h"                => \&usage,
752
		"help|h"                => \&usage,
753
		"nocolor"		=> \$nocolor,
742
		"<>"                    => \&usage
754
		"<>"                    => \&usage
743
	);
755
	);
744
	my $user = qx (whoami);
756
	my $user = qx (whoami);
(-)/usr/share/kiwi/modules/KIWILog.pm.bak (+12 lines)
Lines 507-512 Link Here
507
}
507
}
508
508
509
#==========================================
509
#==========================================
510
# setColorOff
511
#------------------------------------------
512
sub setColorOff {
513
	# ...
514
	# switch off the colored output - do it by simulating output file
515
	# ---
516
	my $this = shift;
517
	$this->{fileLog} = 1;
518
	return $this;
519
}
520
521
#==========================================
510
# setRootLog
522
# setRootLog
511
#------------------------------------------
523
#------------------------------------------
512
sub setRootLog {
524
sub setRootLog {

Return to bug 328298