From 0af08181dcdac477cdc863e75e84535430bdb39f Mon Sep 17 00:00:00 2001 From: espie Date: Wed, 30 Jul 2014 12:44:26 +0000 Subject: [PATCH] prepare for post 5.6 packages, recognize special case where timestamp exist. (specifically, this is a nop for 5.6, but it will allow changes to packages without needing anything in pkg_add) --- usr.sbin/pkg_add/OpenBSD/PkgAdd.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm index 1cdd474d6b0..2100c911c20 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgAdd.pm,v 1.73 2014/07/19 08:48:44 espie Exp $ +# $OpenBSD: PkgAdd.pm,v 1.74 2014/07/30 12:44:26 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie # @@ -85,7 +85,7 @@ sub tie_files my ($self, $sha, $state) = @_; return if $self->{link} or $self->{symlink} or $self->{nochecksum}; # XXX python doesn't like this, overreliance on timestamps - return if $self->{name} =~ m/\.py$/; + return if $self->{name} =~ m/\.py$/ && !defined $self->{ts}; if (defined $sha->{$self->{d}->key}) { my $tied = $sha->{$self->{d}->key}; # don't tie if there's a problem with the file -- 2.20.1