use @RPMCONFIGDIR@/functions

This commit is contained in:
Дмитрий Левин 2006-01-11 16:36:22 +00:00
parent 3ea09f279e
commit 7906742b5d
2 changed files with 5 additions and 12 deletions

View File

@ -1,6 +1,6 @@
#!/bin/sh -ef
#
# Copyright (C) 2000-2005 Dmitry V. Levin <ldv@altlinux.org>
# Copyright (C) 2000-2006 Dmitry V. Levin <ldv@altlinux.org>
# $Id$
#
# find-provides - generate list of linux-specific package provides.
@ -97,8 +97,7 @@ ParseMethod()
ParseMethod $RPM_FINDPROV_DEFAULT_METHOD || return 1
;;
*)
echo "Unrecognized find-provides method: $t" >&2
exit 1
Fatal "Unrecognized find-provides method: $t"
;;
esac
done

View File

@ -23,7 +23,8 @@
[ -z "$RPM_SCRIPTS_DEBUG" ] || set -x
PROG="${0##*/}"
. @RPMCONFIGDIR@/functions
ValidateBuildRoot
exit_handler()
{
@ -35,12 +36,6 @@ exit_handler()
trap exit_handler EXIT
# If using normal root, avoid changing anything.
if [ -z "$(printf %s "$RPM_BUILD_ROOT" |tr -d ' /.')" ]; then
echo "$PROG: non-/ RPM_BUILD_ROOT expected" >&2
exit 1
fi
FIND_FILES=
FIND_LIBS=
FIND_PAM=
@ -130,8 +125,7 @@ ParseMethod()
ParseMethod $RPM_FINDREQ_DEFAULT_METHOD
;;
*)
echo "Unrecognized find-requires method: $t" >&2
exit 1
Fatal "Unrecognized find-requires method: $t"
;;
esac
done