From owner-freebsd-bugs@freebsd.org Wed May 30 13:51:51 2018 Return-Path: Delivered-To: freebsd-bugs@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA99BEFE600 for ; Wed, 30 May 2018 13:51:50 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org [IPv6:2001:1900:2254:206a::50:5]) by mx1.freebsd.org (Postfix) with ESMTP id 497BC845DA for ; Wed, 30 May 2018 13:51:50 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: by mailman.ysv.freebsd.org (Postfix) id 0859FEFE5FB; Wed, 30 May 2018 13:51:50 +0000 (UTC) Delivered-To: bugs@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8918EFE5FA for ; Wed, 30 May 2018 13:51:49 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.ysv.freebsd.org (mxrelay.ysv.freebsd.org [IPv6:2001:1900:2254:206a::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.ysv.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7ECD6845D2 for ; Wed, 30 May 2018 13:51:49 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.ysv.freebsd.org (Postfix) with ESMTPS id C4F3016A28 for ; Wed, 30 May 2018 13:51:48 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id w4UDpm1A045127 for ; Wed, 30 May 2018 13:51:48 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id w4UDpmLb045126 for bugs@FreeBSD.org; Wed, 30 May 2018 13:51:48 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: bugzilla set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 228606] makeroot.sh w/ -f fails with duplicate definition errors Date: Wed, 30 May 2018 13:51:48 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: misc X-Bugzilla-Version: 11.1-STABLE X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: commit-hook@freebsd.org X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: bugs@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 May 2018 13:51:51 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D228606 --- Comment #1 from commit-hook@freebsd.org --- A commit references this bug: Author: emaste Date: Wed May 30 13:51:00 UTC 2018 New revision: 334381 URL: https://svnweb.freebsd.org/changeset/base/334381 Log: makeroot.sh: allow duplicate entries even with -f makefs disallows duplicate entries unless the -D option is specified. Previously makeroot.sh enabled -D unless a filelist was provided via the -f options. The filelist logic creates an mtree manifest from the METALOG and the provided filelist by passing them through `sort -u`, so duplicates were not expected. However, duplicates can still occur when a directory appears in multiple packages -- for example, ./etc/pam.d type=3Ddir uname=3Droot gname=3Dwheel mode=3D0755 ./etc/pam.d type=3Ddir mode=3D0755 tags=3Dpackage=3Druntime ./etc/pam.d type=3Ddir mode=3D0755 tags=3Dpackage=3Dat ./etc/pam.d type=3Ddir mode=3D0755 tags=3Dpackage=3Dftp ./etc/pam.d type=3Ddir mode=3D0755 tags=3Dpackage=3Dtelnet For the purposes of makefs these directory entries are identical, but are of course not identical for sort -u. For now just leave the allow duplicates -D flag enabled. PR: 228606 Sponsored by: The FreeBSD Foundation Changes: head/tools/tools/makeroot/makeroot.sh --=20 You are receiving this mail because: You are the assignee for the bug.=