summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2011-05-14 22:56:07 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-05-14 22:57:54 +0300
commit82d642dc5243cf8901c0639d2bd1667afce5045f (patch)
treee6d36cae1a2776ca2f4676f0f45cde10626d4b78
parent85373fe2e73c8d5c769607e03ff5f536a24e97ef (diff)
Fix fallout from BUILD_SOSL removal
As set_soenv.in used to always put BUILD_SOSL="true" in the environment, we can delete the block completely that was to be executed only if BUILD_SOSL was undefined.
-rwxr-xr-xsolenv/bin/deliver.pl12
1 files changed, 0 insertions, 12 deletions
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 43f826ba9ec3..990b3fa3539d 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -464,18 +464,6 @@ sub init_globals
my $updater = $ENV{'UPDATER'};
my $work_stamp = $ENV{'WORK_STAMP'};
- # special security check for release engineers
- if ( defined($updater) && !$opt_force) {
- my $path = getcwd();
- if ( $path !~ /$work_stamp/io ) {
- print_error("can't deliver from local directory to SOLARVERSION");
- print STDERR "\nDANGER! Release Engineer:\n";
- print STDERR "do you really want to deliver from $path to SOLARVERSION?\n";
- print STDERR "If so, please use the -force switch\n\n";
- exit(7);
- }
- }
-
# do we have a valid environment?
if ( !defined($inpath) ) {
print_error("no environment", 0);