summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2011-05-14 22:02:25 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-05-14 22:02:30 +0300
commit4e011da9221f20025f6d0ae5e28c4bb008401475 (patch)
tree5bc10acea2240b6561cd500e25a26e45706639e8 /solenv
parent5f0b89e382eda1d692e18af8bb2196059acb22d1 (diff)
Kill "BUILD_SOSL", some Hamburg thing
Diffstat (limited to 'solenv')
-rwxr-xr-xsolenv/bin/build.pl1
-rwxr-xr-xsolenv/bin/deliver.pl3
2 files changed, 1 insertions, 3 deletions
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index e47d6b275e7e..f1fda6430bf6 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -225,7 +225,6 @@
if ($prepare) {
get_platforms(\%platforms);
- $deliver_env{'BUILD_SOSL'}++;
$deliver_env{'COMMON_OUTDIR'}++;
$deliver_env{'GUI'}++;
$deliver_env{'INPATH'}++;
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 22ec376af8f7..43f826ba9ec3 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -458,7 +458,6 @@ sub init_globals
$umask = 22;
}
- my $build_sosl = $ENV{'BUILD_SOSL'};
my $common_outdir = $ENV{'COMMON_OUTDIR'};
my $inpath = $ENV{'INPATH'};
my $solarversion = $ENV{'SOLARVERSION'};
@@ -466,7 +465,7 @@ sub init_globals
my $work_stamp = $ENV{'WORK_STAMP'};
# special security check for release engineers
- if ( defined($updater) && !defined($build_sosl) && !$opt_force) {
+ if ( defined($updater) && !$opt_force) {
my $path = getcwd();
if ( $path !~ /$work_stamp/io ) {
print_error("can't deliver from local directory to SOLARVERSION");