From 834d7242bbf6886db16dae6e29ce96f27879698b Mon Sep 17 00:00:00 2001 From: Thom Pol Date: Mon, 15 Mar 2021 20:38:51 +0100 Subject: [PATCH 1/4] Resolve apt sources are not updated in debian (#43) --- lib/os/class.ISPConfigBaseOS.inc.php | 2 +- lib/os/class.ISPConfigDebianOS.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/os/class.ISPConfigBaseOS.inc.php b/lib/os/class.ISPConfigBaseOS.inc.php index 46e8fe5..e6def25 100644 --- a/lib/os/class.ISPConfigBaseOS.inc.php +++ b/lib/os/class.ISPConfigBaseOS.inc.php @@ -258,7 +258,7 @@ class ISPConfigBaseOS { $replace = $replace['replace']; } $need_to_add = false; - if(preg_match('/^\/.*\/[igmsuS]*$/', $search)) { + if(preg_match('/^\/.*\/[igmsuS]*$/mU', $search)) { if($add_if_missing == true && !preg_match($search, $content)) { $need_to_add = true; } else { diff --git a/lib/os/class.ISPConfigDebianOS.inc.php b/lib/os/class.ISPConfigDebianOS.inc.php index ebf9d5b..52de94d 100644 --- a/lib/os/class.ISPConfigDebianOS.inc.php +++ b/lib/os/class.ISPConfigDebianOS.inc.php @@ -282,7 +282,7 @@ class ISPConfigDebianOS extends ISPConfigBaseOS { // enable contrib and non-free ISPConfigLog::info('Enabling contrib and non-free repositories.', true); $replacements = array( - '/^(deb.*\s+main)\s*$/' => '$1 contrib non-free' + '/^(deb.*\s+main)\s*$/mU' => '$1 contrib non-free' ); $this->replaceContents('/etc/apt/sources.list', $replacements); -- GitLab From 23bfd0d8f5c061c23c3c24fb8b281002362c0fee Mon Sep 17 00:00:00 2001 From: Thom Pol Date: Mon, 15 Mar 2021 20:54:56 +0100 Subject: [PATCH 2/4] Add missing U (#43) --- lib/os/class.ISPConfigBaseOS.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/os/class.ISPConfigBaseOS.inc.php b/lib/os/class.ISPConfigBaseOS.inc.php index e6def25..10b0f48 100644 --- a/lib/os/class.ISPConfigBaseOS.inc.php +++ b/lib/os/class.ISPConfigBaseOS.inc.php @@ -258,7 +258,7 @@ class ISPConfigBaseOS { $replace = $replace['replace']; } $need_to_add = false; - if(preg_match('/^\/.*\/[igmsuS]*$/mU', $search)) { + if(preg_match('/^\/.*\/[igmsuUS]*$/mU', $search)) { if($add_if_missing == true && !preg_match($search, $content)) { $need_to_add = true; } else { -- GitLab From 63cd2fa02f718ae4f6e2fe0c19da1085a6a03367 Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Mon, 29 Mar 2021 07:50:56 +0000 Subject: [PATCH 3/4] Apply 1 suggestion(s) to 1 file(s) --- lib/os/class.ISPConfigBaseOS.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/os/class.ISPConfigBaseOS.inc.php b/lib/os/class.ISPConfigBaseOS.inc.php index 10b0f48..582b408 100644 --- a/lib/os/class.ISPConfigBaseOS.inc.php +++ b/lib/os/class.ISPConfigBaseOS.inc.php @@ -258,7 +258,7 @@ class ISPConfigBaseOS { $replace = $replace['replace']; } $need_to_add = false; - if(preg_match('/^\/.*\/[igmsuUS]*$/mU', $search)) { + if(preg_match('/^\/.*?\/[igmsuUS]*$/m', $search)) { if($add_if_missing == true && !preg_match($search, $content)) { $need_to_add = true; } else { -- GitLab From b255598c859364024eac0e64f9b8c51d95a85c6c Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Mon, 29 Mar 2021 07:50:59 +0000 Subject: [PATCH 4/4] Apply 1 suggestion(s) to 1 file(s) --- lib/os/class.ISPConfigDebianOS.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/os/class.ISPConfigDebianOS.inc.php b/lib/os/class.ISPConfigDebianOS.inc.php index 52de94d..76c2953 100644 --- a/lib/os/class.ISPConfigDebianOS.inc.php +++ b/lib/os/class.ISPConfigDebianOS.inc.php @@ -282,7 +282,7 @@ class ISPConfigDebianOS extends ISPConfigBaseOS { // enable contrib and non-free ISPConfigLog::info('Enabling contrib and non-free repositories.', true); $replacements = array( - '/^(deb.*\s+main)\s*$/mU' => '$1 contrib non-free' + '/^(deb.*\s+?main)\s*$/m' => '$1 contrib non-free' ); $this->replaceContents('/etc/apt/sources.list', $replacements); -- GitLab