Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-28 23:42:51 -05:00
Code Packages Releases Activity

distro: Revise server side file handling

Browse Source
This commit is contained in:
purian23
2025-12-16 01:08:12 -05:00
parent b8fca10896
commit 2947ff4131
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
distro/scripts/obs-upload.sh
View File

@@ -862,14 +862,11 @@ else
echo " ⚠️ Could not fetch file list from server, skipping cleanup" echo " ⚠️ Could not fetch file list from server, skipping cleanup"
fi fi
# Fallback update with --server-side-source-service-files flag only syncs metadata (spec, dsc, _service) # Update working copy to latest revision (without expanding service files to avoid revision conflicts)
echo "==> Updating working copy" echo "==> Updating working copy"
if ! osc up --server-side-source-service-files 2>/dev/null; then if ! osc up 2>/dev/null; then
echo " Note: Using regular update (--server-side-source-service-files not supported)" echo "Error: Failed to update working copy"
if ! osc up; then exit 1
echo "Error: Failed to update working copy"
exit 1
fi
fi fi
# Ensure we're in WORK_DIR and it exists # Ensure we're in WORK_DIR and it exists
@@ -944,7 +941,7 @@ if ! osc status 2>/dev/null | grep -qE '^[MAD]|^[?]'; then
else else
echo "==> Committing to OBS" echo "==> Committing to OBS"
set +e set +e
osc commit -m "$MESSAGE" 2>&1 | grep -v "Git SCM package" | grep -v "apiurl\|project\|_ObsPrj\|_manifest\|git-obs" osc commit --skip-local-service-run -m "$MESSAGE" 2>&1 | grep -v "Git SCM package" | grep -v "apiurl\|project\|_ObsPrj\|_manifest\|git-obs"
COMMIT_EXIT=${PIPESTATUS[0]} COMMIT_EXIT=${PIPESTATUS[0]}
set -e set -e
if [[ $COMMIT_EXIT -ne 0 ]]; then if [[ $COMMIT_EXIT -ne 0 ]]; then