sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

find-{requires,provides}: fixed %buildroot/.files:* lists for PackagedFiles()

Browse Source
This commit is contained in:
Alexey Tourbin 2008-03-30 03:14:38 +04:00
parent a0e8d41006
commit f178514e7c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autodeps/linux.prov.in
View File

@ -47,6 +47,7 @@ workdir=$(mktemp -dt "$PROG".XXXXXXXX)
# filter file list through TOPDIR and SKIPLIST patterns # filter file list through TOPDIR and SKIPLIST patterns
while IFS= read -r f; do while IFS= read -r f; do
fname="${f#$RPM_BUILD_ROOT}" fname="${f#$RPM_BUILD_ROOT}"
printf '%s\n' "$fname" >&3
if [ -n "${RPM_FINDPROV_TOPDIR-}" ] && [ -z "${fname%%$RPM_FINDPROV_TOPDIR/*}" ]; then if [ -n "${RPM_FINDPROV_TOPDIR-}" ] && [ -z "${fname%%$RPM_FINDPROV_TOPDIR/*}" ]; then
Debug "skip $f due to RPM_FINDPROV_TOPDIR=$RPM_FINDPROV_TOPDIR" Debug "skip $f due to RPM_FINDPROV_TOPDIR=$RPM_FINDPROV_TOPDIR"
continue continue
@ -70,7 +71,6 @@ while IFS= read -r f; do
fi fi
fi fi
printf '%s\n' "$f" printf '%s\n' "$f"
printf '%s\n' "$fname" >&3
done >"$workdir"/files 3>"$RPM_BUILD_ROOT/.files:$RPM_SUBPACKAGE_NAME" done >"$workdir"/files 3>"$RPM_BUILD_ROOT/.files:$RPM_SUBPACKAGE_NAME"
if ! [ -s "$workdir"/files ]; then if ! [ -s "$workdir"/files ]; then

2
autodeps/linux.req.in
View File

@ -47,6 +47,7 @@ workdir=$(mktemp -dt "$PROG".XXXXXXXX)
# filter file list through TOPDIR and SKIPLIST patterns # filter file list through TOPDIR and SKIPLIST patterns
while IFS= read -r f; do while IFS= read -r f; do
fname="${f#$RPM_BUILD_ROOT}" fname="${f#$RPM_BUILD_ROOT}"
printf '%s\n' "$fname" >&3
if [ -n "${RPM_FINDREQ_TOPDIR-}" ] && [ -z "${fname%%$RPM_FINDREQ_TOPDIR/*}" ]; then if [ -n "${RPM_FINDREQ_TOPDIR-}" ] && [ -z "${fname%%$RPM_FINDREQ_TOPDIR/*}" ]; then
Debug "skip $f due to RPM_FINDREQ_TOPDIR=$RPM_FINDREQ_TOPDIR" Debug "skip $f due to RPM_FINDREQ_TOPDIR=$RPM_FINDREQ_TOPDIR"
continue continue
@ -60,7 +61,6 @@ while IFS= read -r f; do
done done
fi fi
printf '%s\n' "$f" printf '%s\n' "$f"
printf '%s\n' "$fname" >&3
done >"$workdir"/files 3>"$RPM_BUILD_ROOT/.files:$RPM_SUBPACKAGE_NAME" done >"$workdir"/files 3>"$RPM_BUILD_ROOT/.files:$RPM_SUBPACKAGE_NAME"
if ! [ -s "$workdir"/files ]; then if ! [ -s "$workdir"/files ]; then