Skip to content

Commit 18458bf

Browse files
author
Matthias Koeppe
committed
Rename spkg-piprm-requirements.txt to just spkg-requirements.txt
1 parent 2f1a76d commit 18458bf

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

build/bin/sage-dist-helpers

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ sdh_store_and_pip_install_wheel() {
376376
if [ -n "${SAGE_PKG_DIR}" ]; then
377377
# Record name of installed distribution name for uninstallation.
378378
wheel=${wheel##*/}
379-
echo "${wheel%%-*}" >> ${SAGE_PKG_DIR}/spkg-piprm-requirements.txt
379+
echo "${wheel%%-*}" >> ${SAGE_PKG_DIR}/spkg-requirements.txt
380380
fi
381381
}
382382

build/bin/sage-spkg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ WRAPPED_SCRIPTS="build install check preinst postinst $INSTALLED_SCRIPTS"
548548

549549
# Prepare script for uninstallation of packages that use sdh_pip_install
550550
# or sdh_store_and_pip_install_wheel.
551-
echo 'sdh_pip_uninstall -r $SAGE_SPKG_SCRIPTS/$PKG_BASE/spkg-piprm-requirements.txt' > spkg-piprm.in
551+
echo 'sdh_pip_uninstall -r $SAGE_SPKG_SCRIPTS/$PKG_BASE/spkg-requirements.txt' > spkg-piprm.in
552552

553553
for script in $WRAPPED_SCRIPTS; do
554554
# 'Installed' scripts are not run immediately out of the package build
@@ -722,7 +722,7 @@ unset SAGE_DESTDIR_LOCAL
722722
# removed by sage-spkg-uninstall
723723
INSTALLED_SCRIPTS_DEST="$SAGE_SPKG_SCRIPTS/$PKG_BASE"
724724

725-
if [ -f spkg-piprm-requirements.txt ]; then
725+
if [ -f spkg-requirements.txt ]; then
726726
INSTALLED_SCRIPTS="$INSTALLED_SCRIPTS piprm-requirements.txt"
727727
else
728728
# No packages to uninstall with pip, so remove the prepared uninstall script

0 commit comments

Comments
 (0)