Date: Sun, 14 Jul 2013 07:58:10 +0000 (UTC) From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r253337 - stable/9/usr.sbin/portsnap/portsnap Message-ID: <201307140758.r6E7wATa039652@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cperciva Date: Sun Jul 14 07:58:10 2013 New Revision: 253337 URL: http://svnweb.freebsd.org/changeset/base/253337 Log: MFC r253224: Fix bug in deleting files: If two ports had the same tarball and one of them changed (or was removed from the tree) then portsnap would delete that file. This happened earlier today when one of two empty port directories was removed. Uniquifying the lists of needed files fixes this. Approved by: re (delphij) Modified: stable/9/usr.sbin/portsnap/portsnap/portsnap.sh Directory Properties: stable/9/usr.sbin/portsnap/portsnap/ (props changed) Modified: stable/9/usr.sbin/portsnap/portsnap/portsnap.sh ============================================================================== --- stable/9/usr.sbin/portsnap/portsnap/portsnap.sh Sun Jul 14 04:42:35 2013 (r253336) +++ stable/9/usr.sbin/portsnap/portsnap/portsnap.sh Sun Jul 14 07:58:10 2013 (r253337) @@ -809,8 +809,8 @@ fetch_update() { echo "done." # Remove files which are no longer needed - cut -f 2 -d '|' tINDEX INDEX | sort > oldfiles - cut -f 2 -d '|' tINDEX.new INDEX.new | sort | comm -13 - oldfiles | + cut -f 2 -d '|' tINDEX INDEX | sort -u > oldfiles + cut -f 2 -d '|' tINDEX.new INDEX.new | sort -u | comm -13 - oldfiles | lam -s "files/" - -s ".gz" | xargs rm -f rm patchlist filelist oldfiles
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307140758.r6E7wATa039652>