Index | Thread | Search

From:
Marc Espie <marc.espie.openbsd@gmail.com>
Subject:
patch: minor cleanup in update-plist
To:
ports@openbsd.org
Cc:
stu@spacehopper.org, tb@openbsd.org, afresh1@openbsd.org
Date:
Thu, 8 Oct 2026 10:59:12 +0200

Download raw body.

Thread
I totally forgot I already have an identical method in base PackingElement.pm

Can someone commit this ?


Index: update-plist
===================================================================
RCS file: /vide/cvs/ports/infrastructure/bin/update-plist,v
diff -u -p -r1.217 update-plist
--- update-plist	6 Jul 2026 08:12:40 -0000	1.217
+++ update-plist	8 Oct 2026 08:56:53 -0000
@@ -197,9 +197,6 @@ sub locate_files($, $, $)
 # will be zero for classes that cannot be deduced from the FS
 sub rebless_okay($) { 1 }
 
-# unexec should only match objects which are actual files and not directories
-sub is_file($) { 0 }
-
 # helper method
 # the code that checks the suffixes
 sub check_suffix($self, $state)
@@ -664,8 +661,6 @@ sub locate_files($self, $locator, $exact
 	}
 }
 
-sub is_file($) { 1 }
-
 package OpenBSD::PackingElement::Shell;
 # we have no way to figure out @shell
 sub rebless_okay($) { 0 }
@@ -979,7 +974,7 @@ sub copy_from_old($self, $e, $o, $unexec
 		return;
 	}
 
-	if (defined $unexec && $e->is_file) {
+	if (defined $unexec && $e->IsFile) {
 		# XXX we need to unmark it so it can tag along
 		delete $e->{found};
 		$unexec->tag_along($e);