|
|
@@ -137,7 +137,6 @@ setupenvironment() {
|
|
|
echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf
|
|
|
echo "Dir::Bin::Methods \"${BUILDDIRECTORY}/methods\";" >> aptconfig.conf
|
|
|
echo "Dir::Bin::dpkg \"fakeroot\";" >> aptconfig.conf
|
|
|
- echo "Dir::Bin::methods \"${BUILDDIRECTORY}/methods\";" >> aptconfig.conf
|
|
|
echo "DPKG::options:: \"dpkg\";" >> aptconfig.conf
|
|
|
echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf
|
|
|
echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf
|
|
|
@@ -634,9 +633,9 @@ testdpkginstalled() {
|
|
|
msgpass
|
|
|
}
|
|
|
|
|
|
-testdpkgnoninstalled() {
|
|
|
- msgtest "Test for correctly non-installed package(s) with" "dpkg -l $*"
|
|
|
- local PKGS="$(dpkg -l $* | grep '^[a-z]' | grep '^[^u]' | wc -l)"
|
|
|
+testdpkgnotinstalled() {
|
|
|
+ msgtest "Test for correctly not-installed package(s) with" "dpkg -l $*"
|
|
|
+ local PKGS="$(dpkg -l $* 2> /dev/null | grep '^[a-z]' | grep '^[^u]' | wc -l)"
|
|
|
if [ "$PKGS" != 0 ]; then
|
|
|
echo
|
|
|
dpkg -l $* | grep '^[a-z]'
|