From fefc459b8f17f85f22eea1eed6e60059cb2ac04e Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 19 Apr 2007 15:05:59 +0000
Subject: r22378: none needs to be checked first

metze
(This used to be commit 7688919ab879706450a745b59fe5ef2506c25943)
---
 source4/script/tests/selftest.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4')

diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl
index 2fa8075602..a155220e03 100755
--- a/source4/script/tests/selftest.pl
+++ b/source4/script/tests/selftest.pl
@@ -677,13 +677,13 @@ sub setup_env($)
 	my ($envname) = @_;
 
 	my $testenv_vars;
-	if (defined($running_envs{$envname})) {
+	if ($envname eq "none") {
+		$testenv_vars = {};
+	} elsif (defined($running_envs{$envname})) {
 		$testenv_vars = $running_envs{$envname};
 		if (not $target->check_env($testenv_vars)) {
 			$testenv_vars = undef;
 		}
-	} elsif ($envname eq "none") {
-		$testenv_vars = {};
 	} else {
 		$testenv_vars = $target->setup_env($envname, $prefix);
 	}
-- 
cgit