kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

In delete_all_distfiles() when there is no $origin (such as when a port

Browse source 
has moved) but there IS a /var/db/ports/<portname>/distfiles, we do not
want to prompt the user if they are using -d, we just want to delete
the files.

In the code to strip the port from $build_l if the user chose not to
update a port that has an +IGNOREME file, the backslash in "\t" needs
to be escaped.
This commit is contained in:
Doug Barton 2010-06-11 08:23:52 +00:00
parent c932b22040
commit a87f40fe2c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=256358
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ports-mgmt/portmaster/files/portmaster.sh.in
View file

@ -1648,9 +1648,16 @@ delete_all_distfiles () {
echo " Try ${0##*/} --clean-distfiles[-all] for a full cleanup"
echo ''
if [ -n "$dist_list_files" ]; then
echo "===>>> However, the list of files in $dist_list"
echo -n " should be current. Delete the files on this list? y/n [n] "
local answer f ; read answer
local answer f
# Outdent
if [ -z "$ALWAYS_SCRUB_DISTFILES" ]; then
echo "===>>> However, the list of files in $dist_list"
echo -n " should be current. Delete the files on this list? y/n [n] "
read answer
else
answer=y
fi
# Outdent
case "$answer" in
[yY]) for f in $dist_list_files; do
if [ -f "${DISTDIR}${f}" ]; then
@ -2756,7 +2763,7 @@ if [ -e "$pdb/$upg_port/+IGNOREME" ]; then
dep_of_deps=$(( $dep_of_deps - 1 ))
if [ -n "$CONFIG_ONLY" ]; then
num_of_deps=$(( $num_of_deps - 1 ))
build_l="${build_l%\t*}"
build_l="${build_l%\\t*}"
fi
fi
# Outdent