4 files changed, 3 insertions, 7 deletions
diff --git a/regress/usr.sbin/pkg_add/Makefile b/regress/usr.sbin/pkg_add/Makefile
index 0d6f891dd56..e006786ffdc 100644
--- a/regress/usr.sbin/pkg_add/Makefile
+++ b/regress/usr.sbin/pkg_add/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.70 2019/07/10 11:48:36 espie Exp $
+# $OpenBSD: Makefile,v 1.71 2019/07/10 11:53:16 espie Exp $
 
 REGRESS_TARGETS=pkgnames pkgpaths signatures depends-check longnames pkgcfl \
 	collision-check1 collision-check2 collision-check3 \
@@ -766,8 +766,8 @@ tag-delete: rep1/d-0.tgz
 	echo "@depend graphics/zoinx:zoinx-*:zoinx-2" >> ${D40}/pkgdb/d-0/+CONTENTS
 	@ROOT=${D40} ${DELETE_PKG} d
 
-SED_PIPE = sed -e 's/ line .*//' -e s/`whoami`/USER/
-SED_PIPE2 = { u=`whoami`; case $$u in root) u=_pkgfetch;; esac; sed -e 's/ line .*//' -e s/$$u/USER/; }
+SED_PIPE = sed -n -e s/`whoami`/USER/ -e 1p -e '$$p'
+SED_PIPE2 = { u=`whoami`; case $$u in root) u=_pkgfetch;; esac; sed -n -e s/$$u/USER/ -e 1p -e '$$p'; }
 
 
 XXXD=${D40}
diff --git a/regress/usr.sbin/pkg_add/temp1.ref b/regress/usr.sbin/pkg_add/temp1.ref
index 4c24be56759..9876f9af3fa 100644
--- a/regress/usr.sbin/pkg_add/temp1.ref
+++ b/regress/usr.sbin/pkg_add/temp1.ref
@@ -1,3 +1,2 @@
 Fatal error: User USER couldn't create temp dir as /nonexistent/pkginfo.XXXXXXXXXX: No such file or directory
- at /usr/libdata/perl5/OpenBSD/PackageLocation.pm
 okay
diff --git a/regress/usr.sbin/pkg_add/temp2.ref b/regress/usr.sbin/pkg_add/temp2.ref
index d26d57934f0..fa613110431 100644
--- a/regress/usr.sbin/pkg_add/temp2.ref
+++ b/regress/usr.sbin/pkg_add/temp2.ref
@@ -1,3 +1,2 @@
 Fatal error: User USER couldn't create temp file as /nonexistent/session.XXXXXXXXXX: No such file or directory
- at /usr/libdata/perl5/OpenBSD/PackageRepository.pm
 okay
diff --git a/regress/usr.sbin/pkg_add/temp3.ref b/regress/usr.sbin/pkg_add/temp3.ref
index 617bc4c12e2..738c45edf4c 100644
--- a/regress/usr.sbin/pkg_add/temp3.ref
+++ b/regress/usr.sbin/pkg_add/temp3.ref
@@ -1,4 +1,2 @@
 Fatal error: User USER couldn't create temp file as /nonexistent/pkg.XXXXXXXXXX: No such file or directory
-Fatal error: Installation of d-0 failed, partial installation recorded as partial-d-0
- at /usr/libdata/perl5/OpenBSD/PkgAdd.pm
 okay