naccyde / rpms / systemd

Forked from rpms/systemd a year ago
Clone
ac3a84
From f0839034c9910529f368e60262b5653afad58f63 Mon Sep 17 00:00:00 2001
ac3a84
From: Frantisek Sumsal <frantisek@sumsal.cz>
ac3a84
Date: Mon, 7 Nov 2022 16:39:12 +0100
ac3a84
Subject: [PATCH] semaphore: remove the Semaphore repositories recursively
ac3a84
ac3a84
The list of disabled repositories was recently converted from a single
ac3a84
file into a directory with separate repository files, so let's adjust
ac3a84
the setup script accordingly.
ac3a84
ac3a84
```
ac3a84
$ ls -lR /etc/apt/sources.list.d/
ac3a84
/etc/apt/sources.list.d/:
ac3a84
total 36
ac3a84
-rw-r--r-- 1 root root   76 Nov  3 10:28 azure-cli.list
ac3a84
-rw-r--r-- 1 root root   72 Nov  3 10:22 bazel.list
ac3a84
drwxr-xr-x 2 root root 4096 Nov  3 10:31 disabled
ac3a84
-rw-r--r-- 1 root root  113 Nov  3 10:13 docker-source.list
ac3a84
-rw-r--r-- 1 root root  367 Nov  3 10:28 github_git-lfs.list
ac3a84
-rw-r--r-- 1 root root  111 Nov  3 10:25 google-chrome-source.list
ac3a84
-rw-r--r-- 1 root root   64 Nov  3 10:14 google-cloud-sdk.list
ac3a84
-rw-r--r-- 1 root root   54 Nov  3 10:23 helm-stable-debian.list
ac3a84
-rw-r--r-- 1 root root   89 Nov  3 10:29 yarn-source.list
ac3a84
ac3a84
/etc/apt/sources.list.d/disabled:
ac3a84
total 20
ac3a84
-rw-r--r-- 1 root root 100 Nov  3 10:23 devel_kubic_libcontainers_stable.list
ac3a84
-rw-r--r-- 1 root root 103 Nov  3 10:27 git.list
ac3a84
-rw-r--r-- 1 root root 105 Nov  3 10:22 gradle.list
ac3a84
-rw-r--r-- 1 root root 118 Nov  3 10:13 pypy.list
ac3a84
-rw-r--r-- 1 root root 104 Nov  3 10:13 python.list
ac3a84
```
ac3a84
ac3a84
(cherry picked from commit 610eb3f8260ecbb161db5186a5e27417f3110a68)
ac3a84
ac3a84
Related #2138081
ac3a84
---
ac3a84
 .semaphore/semaphore-runner.sh | 2 +-
ac3a84
 1 file changed, 1 insertion(+), 1 deletion(-)
ac3a84
ac3a84
diff --git a/.semaphore/semaphore-runner.sh b/.semaphore/semaphore-runner.sh
ac3a84
index 98fd7b4411..b0d32bd136 100755
ac3a84
--- a/.semaphore/semaphore-runner.sh
ac3a84
+++ b/.semaphore/semaphore-runner.sh
ac3a84
@@ -55,7 +55,7 @@ for phase in "${PHASES[@]}"; do
ac3a84
     case "$phase" in
ac3a84
         SETUP)
ac3a84
             # remove semaphore repos, some of them don't work and cause error messages
ac3a84
-            sudo rm -f /etc/apt/sources.list.d/*
ac3a84
+            sudo rm -rf /etc/apt/sources.list.d/*
ac3a84
 
ac3a84
             # enable backports for latest LXC
ac3a84
             echo "deb http://archive.ubuntu.com/ubuntu $UBUNTU_RELEASE-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/backports.list