pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/bootstrap bootstrap/bootstrap: prevent --wrkdir from b...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2c44d5ea55f5
branches: trunk
changeset: 339500:2c44d5ea55f5
user: rillig <rillig%pkgsrc.org@localhost>
date: Fri Sep 13 20:10:35 2019 +0000
description:
bootstrap/bootstrap: prevent --wrkdir from being a symlink
Without this check, bootstrap will fail later when it builds
bootstrap-mk-files in the usual pkgsrc way. There is an additional check
in bsd.pkg.mk which then fails. Therefore, better fail fast to save some
time.
diffstat:
bootstrap/bootstrap | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diffs (30 lines):
diff -r 9f4ef118000f -r 2c44d5ea55f5 bootstrap/bootstrap
--- a/bootstrap/bootstrap Fri Sep 13 19:53:03 2019 +0000
+++ b/bootstrap/bootstrap Fri Sep 13 20:10:35 2019 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: bootstrap,v 1.270 2019/09/13 19:53:03 rillig Exp $
+# $NetBSD: bootstrap,v 1.271 2019/09/13 20:10:35 rillig Exp $
#
# Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
# All rights reserved.
@@ -358,8 +358,7 @@
*/) die "ERROR: The argument to $2 must not end in /." ;;
*//* | */. | */./* | */.. | */../*)
die "ERROR: The path $1 (from $2) must be canonical." ;;
- /*) [ "${3-}" = "may-be-symlink" ] \
- || checkarg_no_symlink_path "$1" "$2" ;;
+ /*) checkarg_no_symlink_path "$1" "$2" ;;
*) die "ERROR: The argument to $2 must be an absolute path." ;;
esac
}
@@ -511,7 +510,7 @@
checkarg_sane_absolute_path "$varbase" "--varbase"
checkarg_sane_relative_path "$pkginfodir" "--pkginfodir"
checkarg_sane_relative_path "$pkgmandir" "--pkgmandir"
-checkarg_sane_absolute_path "$wrkdir" "--workdir" may-be-symlink
+checkarg_sane_absolute_path "$wrkdir" "--workdir"
# set defaults for system locations if not already set by the user
wrkobjdir=${wrkdir}/pkgsrc
Home |
Main Index |
Thread Index |
Old Index