summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-08-27 18:55:14 +0300
committerTor Lillqvist <tml@collabora.com>2014-08-27 18:56:06 +0300
commit68b845c81826464676a8a67d6002881d9c6a1d99 (patch)
tree837beb754d01dabebb99af95ed445b987677c931 /solenv
parent8d8e8942b2ee2a2e85c65d71628057316c9f5897 (diff)
I think --with-package-format=native/portable can go away
Or does somebody know what they mean and even use either? Change-Id: If935d5d6b53d1f95ec22b19b6b97f4ecfe4d9c06
Diffstat (limited to 'solenv')
-rw-r--r--solenv/bin/modules/installer/control.pm1
-rw-r--r--solenv/bin/modules/installer/parameter.pm2
2 files changed, 0 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 660863a19cd6..3b77433d71e0 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -477,7 +477,6 @@ sub set_addsystemintegration
if ( $installer::globals::languagepack ) { $installer::globals::addsystemintegration = 0; }
if ( $installer::globals::helppack ) { $installer::globals::addsystemintegration = 0; }
- if (( $installer::globals::packageformat eq "native" ) || ( $installer::globals::packageformat eq "portable" )) { $installer::globals::addsystemintegration = 0; }
my $infoline = "Value of \$installer::globals::addsystemintegration: $installer::globals::addsystemintegration\n";
push( @installer::globals::globallogfileinfo, $infoline);
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 5feef849c151..7a7487d0cc75 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -334,8 +334,6 @@ sub setglobalvariables
# Defaulting to native package format for epm
- if ( ! $installer::globals::packageformat ) { $installer::globals::packageformat = "native"; }
-
# no languages defined as parameter
if ($installer::globals::languagelist eq "") { $installer::globals::languages_defined_in_productlist = 1; }