Anonymous avatar Anonymous committed 3cd839f

base on landry's remarks, stuff like .libs* and partial* shouldn't ever
have manual annotation markers.

(the read part is there for legacy, as some stuff is already written
back that way. Eventually, no .libs* will have @option manual-install
left).

Comments (0)

Files changed (1)

usr.sbin/pkg_add/OpenBSD/PackingList.pm

 # ex:ts=8 sw=4:
-# $OpenBSD: PackingList.pm,v 1.120 2012/06/08 15:01:00 espie Exp $
+# $OpenBSD: PackingList.pm,v 1.121 2012/12/28 15:09:09 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
 	return ${$self->{infodir}};
 }
 
+sub zap_wrong_annotations
+{
+	my $self = shift;
+	my $pkgname = $self->pkgname;
+	if (defined $pkgname && $pkgname =~ m/^(?:\.libs\d*|partial)\-/) {
+		delete $self->{'manual-installation'};
+	}
+}
+
 sub conflict_list
 {
 	require OpenBSD::PkgCfl;
 			return if $line =~ m/^\s*$/o;
 			OpenBSD::PackingElement->create($line, $plist);
 		});
+	$plist->zap_wrong_annotations;
 	return $plist;
 }
 
 {
 	my ($self, $fname) = @_;
 	open(my $fh, '>', $fname) or return;
+	$self->zap_wrong_annotations;
 	$self->write($fh);
 	close($fh) or return;
 	return 1;
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.