summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2003-09-13 09:24:07 +0000
committerjlam <jlam@pkgsrc.org>2003-09-13 09:24:07 +0000
commite98f26b486d725eb4a22854302564cc55855eb45 (patch)
treef001c8a8f370f641b5600f4b178d995a7f4fcc59 /pkgtools
parentf3bd37889122bfd28530351a780dc3b11be3434c (diff)
downloadpkgsrc-e98f26b486d725eb4a22854302564cc55855eb45.tar.gz
Update pkg_install to 20030913. Changes from version 20020912 are quieting
the file removal when deleting linkfarms if the expected file doesn't exist. Since the symlink isn't there, the mission is already accomplished, so why bother with the warning?
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_install/files/lib/version.h4
-rw-r--r--pkgtools/pkg_install/files/view/linkfarm.sh.in6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h
index bdff55b7805..c15af2bf3bd 100644
--- a/pkgtools/pkg_install/files/lib/version.h
+++ b/pkgtools/pkg_install/files/lib/version.h
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.13 2003/09/13 05:50:26 jlam Exp $ */
+/* $NetBSD: version.h,v 1.14 2003/09/13 09:24:22 jlam Exp $ */
/*
* Copyright (c) 2001 Thomas Klausner. All rights reserved.
@@ -33,6 +33,6 @@
#ifndef _INST_LIB_VERSION_H_
#define _INST_LIB_VERSION_H_
-#define PKGTOOLS_VERSION "20030912"
+#define PKGTOOLS_VERSION "20030913"
#endif /* _INST_LIB_VERSION_H_ */
diff --git a/pkgtools/pkg_install/files/view/linkfarm.sh.in b/pkgtools/pkg_install/files/view/linkfarm.sh.in
index 5c934139846..06b0d2920b7 100644
--- a/pkgtools/pkg_install/files/view/linkfarm.sh.in
+++ b/pkgtools/pkg_install/files/view/linkfarm.sh.in
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: linkfarm.sh.in,v 1.1 2003/09/08 04:49:07 jlam Exp $
+# $NetBSD: linkfarm.sh.in,v 1.2 2003/09/13 09:24:22 jlam Exp $
#
# Copyright (c) 2002 Alistair G. Crooks. All rights reserved.
@@ -174,9 +174,9 @@ yes)
case $ignore in
no)
if [ $verbose -gt 0 ]; then
- echo "$rmprog $todir/$newf"
+ echo "$rmprog -f $todir/$newf"
fi
- $doit $rmprog $todir/$f ;;
+ $doit $rmprog -f $todir/$f ;;
esac
done
for d in `$findprog . -type d -print | $sortprog -r`; do