On Sun, Mar 24, 2024 at 08:34:42AM +0000, Klemens Nanni wrote:
> On Sat, Mar 23, 2024 at 04:11:04PM +0100, Peter Hessler wrote:
> > this error is worthless and a waste of time, stop generating it:
> >   /usr/ports/www/yt-dlp/pkg/PLIST changed but /usr/ports/www/yt-dlp/pkg/PLIST.orig exists
> 
> It says PLIST changed, but only internal plist info changed and not the
> actual file, so this is in fact an indicator to 'mv PLIST.new PLIST'.

> Just dropping this means, in addition to PLIST.new semantics, you then have
> to find out about all of this yourself, which is not an improvement, imho.

Sorry, I (re)read the code and you remove the $cantmove logic, so PLIST and
PLIST.orig are always written, that's what I had in mind.

patch(1) also just overwrites existing .orig files, I see no reason for
update-plist(1) to differ.

> > OK?

OK kn with the newline merged into the "changed" printf and with
update-plist(1) DESCRIPTION's last paragraph updated accordingly.


Index: share/man/man1/update-plist.1
===================================================================
RCS file: /cvs/src/share/man/man1/update-plist.1,v
diff -u -p -r1.9 update-plist.1
--- share/man/man1/update-plist.1	28 May 2021 18:45:09 -0000	1.9
+++ share/man/man1/update-plist.1	24 Mar 2024 09:41:38 -0000
@@ -304,8 +304,8 @@ will first write files as
 .Pa <file>.new ,
 then it will display which files are new and which files have changed.
 If old packing-lists already exist, it will move old packing lists into
-.Pa <file>.orig
-unless these already exist, then move the new files into position.
+.Pa <file>.orig ,
+then move the new files into position.
 .Sh SEE ALSO
 .Xr pkg_add 1 ,
 .Xr pkg_create 1 ,

> > 
> > Index: infrastructure/bin/update-plist
> > ===================================================================
> > RCS file: /cvs/openbsd/ports/infrastructure/bin/update-plist,v
> > diff -u -p -u -p -r1.214 update-plist
> > --- infrastructure/bin/update-plist	14 May 2023 09:18:05 -0000	1.214
> > +++ infrastructure/bin/update-plist	23 Mar 2024 15:07:59 -0000
> > @@ -1392,7 +1392,6 @@ $self->write_new_files;
> >  
> >  # and now, we figure out where to move the new files
> >  my @towrite = ();
> > -my $cantmove = 0;
> >  
> >  my $exitcode = 0;
> >  
> > @@ -1412,22 +1411,13 @@ for my $p (@{$self->{lists}}) {
> >  			} else {
> >  				print "$k changed";
> >  				push(@towrite, $k);
> > -				if (-f "$k$orig") {
> > -					print " but $k$orig exists\n";
> > -					$cantmove = 1;
> > -				} else {
> > -					print "\n";
> > -				}
> > +				print "\n";
> >  			}
> >  		} else {
> >  			print "$k is new\n";
> >  			push(@towrite, $k);
> >  		}
> >  	}
> > -}
> > -
> > -if ($cantmove) {
> > -	exit(2);
> >  }
> >  
> >  if ($self->{state}->not) {
> > 
> > 
> > -- 
> > Facts are stubborn, but statistics are more pliable.
> > 
>