Skip to content
This repository was archived by the owner on Feb 1, 2023. It is now read-only.

Commit a0ed87e

Browse files
author
Release Manager
committed
Trac #30802: build/bin/write-dockerfile.sh: Do not fail with "build/pkgs/SPKG/type: No such file or directory"
When switching between branches, there are sometimes directories left in the tree. Other code has already been adjusted so that only warnings are emitted; but `build/bin/write-dockerfile.sh` still exits with an error. We fix this in this ticket. URL: https://trac.sagemath.org/30802 Reported by: mkoeppe Ticket author(s): Matthias Koeppe Reviewer(s): Dima Pasechnik
2 parents b3742db + cdd407b commit a0ed87e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

build/bin/write-dockerfile.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ for PKG_SCRIPTS in build/pkgs/*; do
1717
if [ -d $PKG_SCRIPTS ]; then
1818
PKG_BASE=$(basename $PKG_SCRIPTS)
1919
SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/distros/$SYSTEM.txt
20-
PKG_TYPE=$(cat $PKG_SCRIPTS/type)
21-
if [ -f $SYSTEM_PACKAGES_FILE -a -f $PKG_SCRIPTS/spkg-configure.m4 ]; then
20+
if [ -f $PKG_SCRIPTS/type -a -f $SYSTEM_PACKAGES_FILE -a -f $PKG_SCRIPTS/spkg-configure.m4 ]; then
21+
PKG_TYPE=$(cat $PKG_SCRIPTS/type)
2222
PKG_SYSTEM_PACKAGES=$(echo $(${STRIP_COMMENTS} $SYSTEM_PACKAGES_FILE))
2323
if [ -n "PKG_SYSTEM_PACKAGES" ]; then
2424
case "$PKG_TYPE" in

0 commit comments

Comments
 (0)