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

flattening signatures mean they won't be compared, but they still end up

Browse Source 
in the recorded plist, consuming space for nothing. So also remove them
from the plist.

while there, $o->method() becomes $o->method
This commit is contained in:
espie 2009-04-26 08:45:09 +00:00
parent c3ea28c5bb
commit 60e8adb5b1
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
infrastructure/package/register-plist
View File

@ -1,6 +1,6 @@
#! /usr/bin/perl
# $OpenBSD: register-plist,v 1.18 2008/10/06 09:37:02 espie Exp $
# $OpenBSD: register-plist,v 1.19 2009/04/26 08:45:09 espie Exp $
# Copyright (c) 2005
# Marc Espie. All rights reserved.
# Redistribution and use in source and binary forms, with or without
@ -301,8 +301,9 @@ for my $pkgfile (@ARGV) {
die "Bad package $pkgfile";
}
my $plist = $pkg->plist();
my $plist = $pkg->plist;
undef $plist->{ OpenBSD::PackageInfo::COMMENT };
undef $plist->{"digital-signature"};
my $l = $plist->{items};
if ($l->[@$l-1]->isa('OpenBSD::PackingElement::Cwd') &&
@ -310,12 +311,12 @@ for my $pkgfile (@ARGV) {
pop @$l;
}
$plist->forget_details();
$pkg->close();
$pkg->wipe_info();
$plist->forget_details;
$pkg->close;
$pkg->wipe_info;
for my $dir (@dirs) {
next unless -d $dir;
my $result = $dir.'/'.$plist->pkgname();
my $result = $dir.'/'.$plist->pkgname;
if (-f $result) {
my $plist2 = OpenBSD::PackingList->fromfile($result);
my $r = my_compare($plist, $plist2);
@ -333,7 +334,7 @@ for my $pkgfile (@ARGV) {
}
}
if (!$error) {
my $result = $dirs[0].'/'.$plist->pkgname();
my $result = $dirs[0].'/'.$plist->pkgname;
if (!-f $result) {
$plist->tofile($result);
}