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

a few more things to wrap as the correct user

Browse Source
This commit is contained in:
espie 2015-05-05 08:52:05 +00:00
parent f5e1489f2c
commit bb202eca87
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infrastructure/lib/DPB/Job/Port.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4: # ex:ts=8 sw=4:
# $OpenBSD: Port.pm,v 1.155 2015/05/03 08:15:35 espie Exp $ # $OpenBSD: Port.pm,v 1.156 2015/05/05 08:52:05 espie Exp $
# #
# Copyright (c) 2010-2013 Marc Espie <espie@openbsd.org> # Copyright (c) 2010-2013 Marc Espie <espie@openbsd.org>
# #
@ -705,7 +705,7 @@ sub finalize
# so it can be rewritten and sorted # so it can be rewritten and sorted
# don't keep a handle on it, so that we always # don't keep a handle on it, so that we always
# append new information to the correct filename # append new information to the correct filename
open(my $fh2, '>>', $job->{builder}{state}{size_log}); my $fh2 = $job->{builder}->logger->open('>>', $job->{builder}{state}{size_log});
print $fh2 $info."\n"; print $fh2 $info."\n";
} }
} }

10
infrastructure/lib/DPB/PortBuilder.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4: # ex:ts=8 sw=4:
# $OpenBSD: PortBuilder.pm,v 1.66 2015/05/02 15:59:35 espie Exp $ # $OpenBSD: PortBuilder.pm,v 1.67 2015/05/05 08:52:05 espie Exp $
# #
# Copyright (c) 2010-2013 Marc Espie <espie@openbsd.org> # Copyright (c) 2010-2013 Marc Espie <espie@openbsd.org>
# #
@ -137,7 +137,10 @@ sub pkgfile
sub check sub check
{ {
my ($self, $v) = @_; my ($self, $v) = @_;
return -f $self->pkgfile($v); return $self->{state}{build_user}->run_as(
sub {
return -f $self->pkgfile($v);
});
} }
sub end_check sub end_check
@ -175,7 +178,8 @@ sub report
print $log "!\n"; print $log "!\n";
} else { } else {
print $log "\n"; print $log "\n";
open my $fh, '>>', $self->{state}{permanent_log}; my $fh = $self->logger->open(
'>>', $self->{state}{permanent_log});
print $fh DPB::Serialize::Build->write({ print $fh DPB::Serialize::Build->write({
pkgpath => $pkgpath, pkgpath => $pkgpath,
host => $host, host => $host,