diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2023-12-12 14:25:52 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2023-12-13 08:24:41 +0100 |
| commit | 5af8759dc7bd9219f0cfc01aaa0d83b323a581ae (patch) | |
| tree | 41b1d48503661cb838d46e50b2abf5cd08c26271 /solenv | |
| parent | 038e82c20ce50ca4d9005a1f6bc948bb73222fc0 (diff) | |
Split --with-update-config=... into many --with-online-update-mar-...=...
...and allow each of them to be left off, for debug purposes, even if that may
render the resulting --enable-online-update-mar feature non-functional.
This change tracked each item that was potentially read from the
--with-update-config ini file, and turned each of them into a new
--with-online-update-mar-... option. The only exception and remaining TODO is
bin/update/upload_build_config.py (called from Makefile.gbuild).
distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf (which might well be dead)
set --with-update-config=~/updater.ini with an ini file of unknown content. So
that no items are silently missing if we ever resurrect that distro-config, I
set all of the new options to =TODO there for now.
Change-Id: I17a13e0d190a868436bac10c1b0a6675d8c704c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160622
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
(cherry picked from commit e88bb8f6be937aeb951f1a64b4ff4e8c7e1280cc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160636
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 54f3618d1078..df76cb6704c1 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -655,25 +655,7 @@ sub replace_setup_variables my $updateid = $productname . "_" . $libo_version_major . "_" . $$languagestringref; $updateid =~ s/ /_/g; - my $updatechannel = ""; - if ( $ENV{'UPDATE_CONFIG'} && $ENV{'UPDATE_CONFIG'} ne "") - { - open(CONFIG, glob($ENV{'UPDATE_CONFIG'})); - while (<CONFIG>) - { - chomp; - if (/^s*(\S+)=(\S+)$/) - { - my $key = $1; - my $val = $2; - if ($key eq "channel") - { - $updatechannel = $val; - } - } - } - close(CONFIG); - } + my $updatechannel = $ENV{'ONLINEUPDATE_MAR_CHANNEL'}; for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ ) { |