svn commit: r209036 - user/dougb/portmaster
Doug Barton
dougb at FreeBSD.org
Fri Jun 11 08:13:27 UTC 2010
Author: dougb
Date: Fri Jun 11 08:13:26 2010
New Revision: 209036
URL: http://svn.freebsd.org/changeset/base/209036
Log:
In delete_all_distfiles() when there is no $origin (such as when a port
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 a 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.
Modified:
user/dougb/portmaster/portmaster
Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster Fri Jun 11 06:04:14 2010 (r209035)
+++ user/dougb/portmaster/portmaster Fri Jun 11 08:13:26 2010 (r209036)
@@ -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" ]; th
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
More information about the svn-src-user
mailing list