aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordancer <dancer>2005-12-05 14:24:54 +0000
committerdancer <dancer>2005-12-05 14:24:54 +0000
commitd3de524b320dccb7d1e6d3dbd65dc5da1067564a (patch)
tree38c1abe706790a4819c4968fe7c43215a87a3ac2
parente5da17475f9bcc26f815644dbf30ae38ffa78dc9 (diff)
downloadpbuilder-d3de524b320dccb7d1e6d3dbd65dc5da1067564a.tar
pbuilder-d3de524b320dccb7d1e6d3dbd65dc5da1067564a.tar.gz
Use readlink -e instead of readlink -f :
* pdebuild-user-mode-linux: * pdebuild-uml-checkparams: * pdebuild-checkparams: * pdebuild: readlink -e instead of readlink -f * pbuilder-uml-checkparams: readlink -e instead of readlink -f * pbuilder-modules: readlink -e instead of readlink -f * pbuilder-createbuildenv: quote HOOKDIR and readlink -e instead of readlink -f. * pbuilder-checkparams: * pbuilder-buildpackage: use readlink -e here. * pbuilder-buildpackage-funcs: use readlink -e instead of readlink -f. 342117 thanks to Markus Kolb
-rw-r--r--ChangeLog19
-rw-r--r--debian/changelog6
-rwxr-xr-xpbuilder-buildpackage2
-rw-r--r--pbuilder-buildpackage-funcs4
-rwxr-xr-xpbuilder-checkparams8
-rwxr-xr-xpbuilder-createbuildenv2
-rw-r--r--pbuilder-modules2
-rw-r--r--pbuilder-uml-checkparams6
-rwxr-xr-xpbuilder-user-mode-linux2
-rw-r--r--pdebuild2
-rw-r--r--pdebuild-checkparams2
-rw-r--r--pdebuild-uml-checkparams2
-rw-r--r--pdebuild-user-mode-linux4
13 files changed, 40 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index 68eeedd..741dffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,24 @@
2005-12-05 Junichi Uekawa <dancer@debian.org>
- * pbuilder-buildpackage-funcs: 'install' was missing from apt-get for EXTRAPACKAGES handling. Fix.
+ * pdebuild-user-mode-linux:
+ * pdebuild-uml-checkparams:
+ * pdebuild-checkparams:
+ * pdebuild: readlink -e instead of readlink -f
+
+ * pbuilder-uml-checkparams: readlink -e instead of readlink -f
+
+ * pbuilder-modules: readlink -e instead of readlink -f
+
+ * pbuilder-createbuildenv: quote HOOKDIR and readlink -e instead of readlink -f.
+
+ * pbuilder-checkparams:
+ * pbuilder-buildpackage: use readlink -e here.
+
+ * pbuilder-buildpackage-funcs: use readlink -e instead of readlink -f. 338976, reopened as 342117
+ thanks to Markus Kolb
+ * pbuilder-buildpackage-funcs: 'install' was missing from apt-get for EXTRAPACKAGES handling. Fix.
+
* pbuilderrc: make fakeroot default.
* Documentation/pbuilder-doc.xml: update a note on pdebuild-internal is ran as the outside user uid.
diff --git a/debian/changelog b/debian/changelog
index 54cb58b..f77f5d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
pbuilder (0.142) UNRELEASED; urgency=low
[Junichi Uekawa]
- *
+ * Bug fix: "readlink -f/-e", thanks to Brian Nelson (Closes: #342117).
+ Use readlink -e instead of readlink -f, readlink -f does not fail if
+ the file symlink points to does not exist.
- -- Junichi Uekawa <dancer@debian.org> Mon, 5 Dec 2005 21:25:03 +0900
+ -- Junichi Uekawa <dancer@debian.org> Mon, 5 Dec 2005 23:23:31 +0900
pbuilder (0.141) unstable; urgency=low
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index db9dd9f..8598e57 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -61,7 +61,7 @@ if [ -z "${PBUILDER_BUILD_LOGFILE}" ]; then
PBUILDER_BUILD_LOGFILE="${BUILDRESULT}/"$(basename "${PACKAGENAME}" .dsc)
exec > "${PBUILDER_BUILD_LOGFILE}"
exec 2>&1
- PBUILDER_BUILD_LOGFILE=$(readlink -f "${PBUILDER_BUILD_LOGFILE}")
+ PBUILDER_BUILD_LOGFILE=$(readlink -e "${PBUILDER_BUILD_LOGFILE}")
echo "I: Using pkgname logfile"
showbuildbanner '$Id$'
echobacktime
diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs
index d1ead6d..69879dd 100644
--- a/pbuilder-buildpackage-funcs
+++ b/pbuilder-buildpackage-funcs
@@ -70,8 +70,8 @@ function cowprotect () {
# a hack for cowdancer, used when a file is edited in-place;
# Copy the file to create a new i-node so that hardlinked original is intact
for A in "$@"; do
- if readlink -f "$A"; then
- A=$(readlink -f "$A")
+ if readlink -e "$A"; then
+ A=$(readlink -e "$A")
mv "$A" "$A"~
cp -a "$A"~ "$A"
rm -f "$A"~
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 138dc4f..24b1229 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -56,7 +56,7 @@ while [ -n "$1" ]; do
echo "E: Directory $2 does not exist" >&2
exit 1
fi
- BUILDPLACE=$(readlink -f "$2");
+ BUILDPLACE=$(readlink -e "$2");
shift; shift;
;;
--mirror)
@@ -82,7 +82,7 @@ while [ -n "$1" ]; do
--buildresult)
if [ -n "$2" ]; then
if [ -d "$2" ]; then
- BUILDRESULT=$(readlink -f "$2");
+ BUILDRESULT=$(readlink -e "$2");
else
echo "E: Directory $2 does not exist" >&2
exit 1
@@ -95,7 +95,7 @@ while [ -n "$1" ]; do
--aptcache)
if [ -n "$2" ]; then
if [ -d "$2" ]; then
- APTCACHE=$(readlink -f "$2");
+ APTCACHE=$(readlink -e "$2");
else
echo "E: Directory $2 does not exist" >&2
exit 1
@@ -142,7 +142,7 @@ while [ -n "$1" ]; do
echo " -> Logging to $2"
exec > "$2";
exec 2>&1
- PBUILDER_BUILD_LOGFILE=$(readlink -f "$2")
+ PBUILDER_BUILD_LOGFILE=$(readlink -e "$2")
shift; shift;
;;
--pkgname-logfile)
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index 50b9236..45d3a9f 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -50,7 +50,7 @@ echo " -> running $DEBOOTSTRAP"
unset DEBOOTSTRAPSCRIPT
if [ -n "$HOOKDIR" ]; then
if [ -f "$HOOKDIR/$DISTRIBUTION" ]; then
- DEBOOTSTRAPSCRIPT=$(readlink -f $HOOKDIR)"/$DISTRIBUTION"
+ DEBOOTSTRAPSCRIPT=$(readlink -e "$HOOKDIR")"/$DISTRIBUTION"
echo " -> Applying user distribution dist build script $DEBOOTSTRAPSCRIPT"
fi
fi
diff --git a/pbuilder-modules b/pbuilder-modules
index 6a0ada9..2924a82 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -266,7 +266,7 @@ function copy_local_configuration () {
if [ ! -f "/etc/$a" ]; then
echo "E: /etc/$a does not exist, your setup is insane. fix it" >&2
fi
- cp $( readlink -f "/etc/$a" ) "$BUILDPLACE/etc/$a";
+ cp $( readlink -e "/etc/$a" ) "$BUILDPLACE/etc/$a";
done
}
diff --git a/pbuilder-uml-checkparams b/pbuilder-uml-checkparams
index c361247..fddd611 100644
--- a/pbuilder-uml-checkparams
+++ b/pbuilder-uml-checkparams
@@ -102,7 +102,7 @@ while [ -n "$1" ] ; do
--buildresult)
# ignore buildresult
if [ -d "$2" ]; then
- UML_BUILDRESULT=$(readlink -f "$2")
+ UML_BUILDRESULT=$(readlink -e "$2")
else
echo "E: Directory $2 does not exist" >&2
exit 1
@@ -110,7 +110,7 @@ while [ -n "$1" ] ; do
shift; shift;;
--buildplace)
if [ -d "$2" ]; then
- BUILDPLACE=$(readlink -f "$2")
+ BUILDPLACE=$(readlink -e "$2")
else
echo "E: Directory $2 does not exist" >&2
exit 1
@@ -119,7 +119,7 @@ while [ -n "$1" ] ; do
--logfile)
exec > "$2";
exec 2>&1
- PBUILDER_BUILD_LOGFILE=$(readlink -f "$2")
+ PBUILDER_BUILD_LOGFILE=$(readlink -e "$2")
shift;shift;;
--)
shift;
diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux
index 6d8c1d8..5742038 100755
--- a/pbuilder-user-mode-linux
+++ b/pbuilder-user-mode-linux
@@ -146,7 +146,7 @@ EOF
-BUILDING_DSC_FILE=$(readlink -f "$1") || true # ignore failure here
+BUILDING_DSC_FILE=$(readlink -e "$1") || true # ignore failure here
EXTRACLEANUP=
UML_EXITCODE=1
case "${OPERATION}" in
diff --git a/pdebuild b/pdebuild
index 69e3757..e6eb539 100644
--- a/pdebuild
+++ b/pdebuild
@@ -37,7 +37,7 @@ export BUILDRESULTUID=$(id -u)
export BUILDRESULTGID=$(id -g)
if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then
- ${PBUILDERROOTCMD} pbuilder execute "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -f ..) /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}"
+ ${PBUILDERROOTCMD} pbuilder execute "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -e ..) /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}"
else
if ! dpkg-checkbuilddeps -B ; then
echo "W: Unmet build-dependency in source"
diff --git a/pdebuild-checkparams b/pdebuild-checkparams
index 6cd055f..daaeddd 100644
--- a/pdebuild-checkparams
+++ b/pdebuild-checkparams
@@ -28,7 +28,7 @@ while [ -n "$1" ]; do
--buildresult)
if [ -n "$2" ]; then
if [ -d "$2" ]; then
- BUILDRESULT=$(readlink -f "$2");
+ BUILDRESULT=$(readlink -e "$2");
else
echo "E: Directory $2 does not exist" >&2
exit 1
diff --git a/pdebuild-uml-checkparams b/pdebuild-uml-checkparams
index 4a5f497..2d07957 100644
--- a/pdebuild-uml-checkparams
+++ b/pdebuild-uml-checkparams
@@ -68,7 +68,7 @@ while [ -n "$1" ] ; do
--buildresult)
# ignore buildresult
if [ -d "$2" ]; then
- UML_BUILDRESULT=$(readlink -f "$2")
+ UML_BUILDRESULT=$(readlink -e "$2")
else
echo "E: Directory $2 does not exist" >&2
exit 1
diff --git a/pdebuild-user-mode-linux b/pdebuild-user-mode-linux
index 77e4af8..ce0b7e6 100644
--- a/pdebuild-user-mode-linux
+++ b/pdebuild-user-mode-linux
@@ -36,11 +36,11 @@ ARCHITECTURE=$(dpkg-architecture -qDEB_HOST_ARCH)
if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then
- if [ ! readlink -f .. ]; then
+ if [ ! readlink -e .. ]; then
echo "E: Cannot find .. dir from PWD=$(pwd)"
exit 1
fi
- pbuilder-user-mode-linux execute "$@" --bindmounts $(readlink -f ..) /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}"
+ pbuilder-user-mode-linux execute "$@" --bindmounts $(readlink -e ..) /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}"
else
if ! dpkg-checkbuilddeps -B; then
echo "W: Unmet build-dependency in source"