mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-06 22:07:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "testing/merge-usr: backport return error"

Browse Source 
This reverts commit db8f242edc.
This commit is contained in:
fossdd 2025-07-26 23:53:51 +02:00
parent cbe1387a77
commit b34859c008
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/merge-usr/APKBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: Clayton Craft <clayton@craftyguy.net> # Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=merge-usr pkgname=merge-usr
pkgver=0_git20250725 pkgver=0_git20250725
pkgrel=1 pkgrel=0
_commit="f6d5a52ed5aa37a0505a9d9a6d8af3a3133728d1" _commit="f6d5a52ed5aa37a0505a9d9a6d8af3a3133728d1"
pkgdesc="Script to produce a merged-usr system" pkgdesc="Script to produce a merged-usr system"
url="https://gitlab.alpinelinux.org/postmarketos/merge-usr" url="https://gitlab.alpinelinux.org/postmarketos/merge-usr"
@ -11,8 +11,7 @@ license="GPL-2.0-or-later"
# attr is an optional dependency. How do we go about it? # attr is an optional dependency. How do we go about it?
depends="attr" depends="attr"
checkdepends="jchroot" checkdepends="jchroot"
source="https://gitlab.alpinelinux.org/postmarketos/merge-usr/-/archive/$_commit/$_commit.tar.gz source="https://gitlab.alpinelinux.org/postmarketos/merge-usr/-/archive/$_commit/$_commit.tar.gz"
return-errors.patch"
builddir="$srcdir/$pkgname-$_commit" builddir="$srcdir/$pkgname-$_commit"
# Tests need to be run as root # Tests need to be run as root
options="!check" options="!check"
@ -30,5 +29,4 @@ package() {
} }
sha512sums=" sha512sums="
6522a8c063c08610b3101e18403e94eab8ab2d5ca737608444e546a9ed7f6c98b370457ecc9765c830a6e493ed7a86fd3acc836a8b5bff3747cac7f7ee27a753 f6d5a52ed5aa37a0505a9d9a6d8af3a3133728d1.tar.gz 6522a8c063c08610b3101e18403e94eab8ab2d5ca737608444e546a9ed7f6c98b370457ecc9765c830a6e493ed7a86fd3acc836a8b5bff3747cac7f7ee27a753 f6d5a52ed5aa37a0505a9d9a6d8af3a3133728d1.tar.gz
9ac485ea7481c98af4ced1c17d51f424cfb0777a898fc1232c035638d92622393b1a262c8dd209b566e2164824dabac84879f5003df5e893c7b36e05b76d794e return-errors.patch
" "

19
testing/merge-usr/return-errors.patch
View File

@ -1,19 +0,0 @@
commit c042121
Author: Pablo Correa Gómez <pabloyoyoista@postmarketos.org>
Date: Fri Jul 25 11:45:00 2025 +0200
merge-usr: fix return value not being a variable
diff --git a/merge-usr b/merge-usr
index 34dc646..e4866ee 100755
--- a/merge-usr
+++ b/merge-usr
@@ -474,7 +474,7 @@ copy_tree() {
copy_tree "$src" "$dst"
errors=$((errors + $?))
if [ "$DRYRUN" = "false" ]; then
- return errors
+ return $errors
fi
else
log_error "Conflict for directory '$src'"