cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

run diff directly, as discussed with jasper et al

Browse Source
This commit is contained in:
espie 2010-06-11 11:20:48 +00:00
parent 93b11bb381
commit bcc28ff989
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infrastructure/package/register-plist
View File

@ -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) {