From b345ea6c312fb484bfd0771f2b39ed8bdc7774e3 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 10 Jul 2016 09:00:33 +0200 Subject: [PATCH] * Package install/update: no more limit memory as backup might fail, do not run backup for single apps --- doc/rpm-build/post_install.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/rpm-build/post_install.php b/doc/rpm-build/post_install.php index 0778060a6b..728507a703 100755 --- a/doc/rpm-build/post_install.php +++ b/doc/rpm-build/post_install.php @@ -251,7 +251,8 @@ foreach(array('php','source_dir','data_dir','setup-cli') as $name) // fix important php.ini and conf.d/*.ini settings check_fix_php_apc_ini(); -$setup_cli = $config['php'].' -d memory_limit=256M '.$config['setup-cli']; +// not limiting memory, as backups might fail with limit we set +$setup_cli = $config['php'].' -d memory_limit=-1 '.$config['setup-cli']; if (!file_exists($config['header']) || filesize($config['header']) < 200) // default header redirecting to setup is 147 bytes { @@ -398,8 +399,9 @@ else patch_header($config['header'], $config['config_user'], $old_password); }); - // update egroupware - $setup_update = $setup_cli.' --update '.escapeshellarg('all,'.$config['config_user'].','.$config['config_passwd'].',,'.$config['install-update-app']); + // update egroupware, or single app(s), in later case skip backup + $setup_update = $setup_cli.' --update '.escapeshellarg('all,'.$config['config_user'].','.$config['config_passwd']. + (empty($config['install-update-app']) ? '' : ',no,'.$config['install-update-app'])); $ret = run_cmd($setup_update,$output,array(4,15)); switch($ret)