From: Luca Boccassi <bluca@debian.org>
Date: Sat, 17 Dec 2022 13:49:21 +0000 (+0100)
Subject: Merge pull request #25387 from yuwata/core-fix-gc-logic
X-Git-Tag: v253-rc1~252
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=896785a7d9cabc4b6df707ba95d831382749764e;p=thirdparty%2Fsystemd.git

Merge pull request #25387 from yuwata/core-fix-gc-logic

core: fix logic of merging units
---

896785a7d9cabc4b6df707ba95d831382749764e
diff --cc test/units/testsuite-26.sh
index 0fe0d9b0d95,a8e7a5abaa7..2e0350aabe3
--- a/test/units/testsuite-26.sh
+++ b/test/units/testsuite-26.sh
@@@ -4,15 -3,20 +4,23 @@@
  set -eux
  set -o pipefail
  
+ # shellcheck source=test/units/assert.sh
+ . "$(dirname "$0")"/assert.sh
+ 
+ : >/failed
+ 
  at_exit() {
      if [[ -v UNIT_NAME && -e "/usr/lib/systemd/system/$UNIT_NAME" ]]; then
 -        rm -fv "/usr/lib/systemd/system/$UNIT_NAME"
 +        rm -fvr "/usr/lib/systemd/system/$UNIT_NAME" "/etc/systemd/system/$UNIT_NAME.d" "+4"
      fi
+ 
+     rm -f /etc/init.d/issue-24990
+     return 0
  }
  
 +# shellcheck source=test/units/assert.sh
 +. "$(dirname "$0")"/assert.sh
 +
  trap at_exit EXIT
  
  # Create a simple unit file for testing