mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

appliance: Error out if QUERY_FILES_CMD cannot be set

Browse Source 
Instead of continuing on regardless and failing with a weird error
later, error out early if we don't know about the distro and so cannot
set QUERY_FILES_CMD.  This avoids situations like
https://github.com/libguestfs/libguestfs/issues/81
This commit is contained in:
Richard W.M. Jones
2022-05-21 17:19:54 +01:00
parent bf5fcdbc9b
commit 4418e6345a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
appliance/Makefile.am
View File

@@ -79,16 +79,19 @@ make.sh: make.sh.in $(top_builddir)/config.log $(top_builddir)/config.status
PACKAGELIST_CPP_FLAGS = -D$(DISTRO)=1 -DEXTRA_PACKAGES="$(EXTRA_PACKAGES)" PACKAGELIST_CPP_FLAGS = -D$(DISTRO)=1 -DEXTRA_PACKAGES="$(EXTRA_PACKAGES)"
if HAVE_RPM if HAVE_RPM
QUERY_FILES_CMD := xargs rpm -qf --qf '%{name}\n' QUERY_FILES_CMD := xargs rpm -qf --qf '%{name}\n'
endif else
if HAVE_DPKG if HAVE_DPKG
QUERY_FILES_CMD := sed -e 's,^/,\*/,' | xargs dpkg -S | cut -d: -f1 QUERY_FILES_CMD := sed -e 's,^/,\*/,' | xargs dpkg -S | cut -d: -f1
endif else
if HAVE_PACMAN if HAVE_PACMAN
QUERY_FILES_CMD := xargs pacman -Qo | sed -r 's/.* is owned by ([^ ]+) .*/\1/' QUERY_FILES_CMD := xargs pacman -Qo | sed -r 's/.* is owned by ([^ ]+) .*/\1/'
endif else
$(error Error: Unknown Linux distribution "$(DISTRO)". Please add support to m4/guestfs-appliance.m4 and appliance/Makefile.am and send a patch upstream to libguestfs@redhat.com)
endif !HAVE_PACMAN
endif !HAVE_DPKG
endif !HAVE_RPM
# Automatically generate library dependency list # Automatically generate library dependency list
guestfsd.deps: ../daemon/guestfsd guestfsd.deps: ../daemon/guestfsd