From bcc28ff989bdce25da207afba2b9b79720e159f1 Mon Sep 17 00:00:00 2001 From: espie Date: Fri, 11 Jun 2010 11:20:48 +0000 Subject: [PATCH] run diff directly, as discussed with jasper et al --- infrastructure/package/register-plist | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/infrastructure/package/register-plist b/infrastructure/package/register-plist index 69fd49f68f9..eb1bbf7e5f7 100644 --- a/infrastructure/package/register-plist +++ b/infrastructure/package/register-plist @@ -1,6 +1,6 @@ #! /usr/bin/perl -# $OpenBSD: register-plist,v 1.19 2009/04/26 08:45:09 espie Exp $ +# $OpenBSD: register-plist,v 1.20 2010/06/11 11:20:48 espie Exp $ # Copyright (c) 2005 # Marc Espie. All rights reserved. # Redistribution and use in source and binary forms, with or without @@ -29,6 +29,7 @@ use strict; use OpenBSD::PackageLocator; use OpenBSD::PackageInfo; use OpenBSD::PackingList; +use OpenBSD::Paths; package OpenBSD::PackingElement; @@ -323,8 +324,8 @@ for my $pkgfile (@ARGV) { if ($r == 1) { my $t = "$result-new"; $plist->tofile($t); - print STDERR "Error: change in plist\n"; - print STDERR "\tdiff -u $result $t\n"; + print STDERR "Error: change in plist between $result and $t\n"; + system {OpenBSD::Paths->diff} ('diff', '-u', $result, $t); $error++; } if ($r == 2) {