From: Rafael Sadowski <rafael@sizeofvoid.org>
Subject: Re: fix "PLIST.orig already exists"
To: Peter Hessler <phessler@theapt.org>
Cc: ports@openbsd.org
Date: Sat, 23 Mar 2024 21:00:23 +0100

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
> 
> OK?

+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.
>