From owner-svn-src-all@FreeBSD.ORG Tue Feb 19 13:28:07 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 90E1372E for ; Tue, 19 Feb 2013 13:28:07 +0000 (UTC) (envelope-from mailer-daemon@vniz.net) Received: from mail-la0-x22e.google.com (mail-la0-x22e.google.com [IPv6:2a00:1450:4010:c03::22e]) by mx1.freebsd.org (Postfix) with ESMTP id 1A71BD5D for ; Tue, 19 Feb 2013 13:28:06 +0000 (UTC) Received: by mail-la0-f46.google.com with SMTP id fq12so6517963lab.33 for ; Tue, 19 Feb 2013 05:28:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:message-id:disposition-notification-to:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :openpgp:content-type:x-gm-message-state; bh=nxT1BgXClwbDx3Y8tkKzRPT/JkvC49vQqzE0rhiLsZ0=; b=caA+AaWvP5lxTu6QrSUIX4FnfN099U+ixa4P1av1EAB/cWrxeM8yuea79CbpZh4gwc t2ornelj6uVmAcYQ8kjYJem4A+3GVxqbGQt3c5C6XCIVEI6/0WPc6K10qJPuNdHw8hHi CHUMUXpS/BTWfrHpmAQ2MprPTNJFCx6IXoVQZqq81xH6SINnX4P2gcmPYfNo9hU+/KSy R6MQtxC5MR4bQ4JwOoXxUryyG45Jx5ak9pxeRJZ8YiSCiNiQx1Zm4va2jfU0W9rIfF2b tStCInCjTdP0jEfOQYKIkfv+N5YAnczV7zeNlm4olbrXSPxxsweC6KBLruGrZMztJKuw 7OmQ== X-Received: by 10.152.130.131 with SMTP id oe3mr14134924lab.1.1361280485405; Tue, 19 Feb 2013 05:28:05 -0800 (PST) Received: from [192.168.1.2] ([89.169.163.3]) by mx.google.com with ESMTPS id gm20sm21337073lab.7.2013.02.19.05.28.04 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Feb 2013 05:28:04 -0800 (PST) Message-ID: <51237DDD.90301@freebsd.org> Date: Tue, 19 Feb 2013 17:27:57 +0400 From: Andrey Chernov User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 To: Brooks Davis Subject: Re: svn commit: r246913 - head/etc References: <201302171306.r1HD6xGM028562@svn.freebsd.org> <20130218225511.GC91067@lor.one-eyed-alien.net> <512358A5.7050800@freebsd.org> <5123621F.1050000@freebsd.org> In-Reply-To: <5123621F.1050000@freebsd.org> OpenPGP: id=964474DD Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="----enig2PXBHTTSFIGDJFVBFOECC" X-Gm-Message-State: ALoCoQmBCZ4OqlUryUlYvFWgcW0b5rZy1ZCjBOf12a0IudpFXGXFWgptNVShc4KlIWr2e6FhioR9 Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2013 13:28:07 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2PXBHTTSFIGDJFVBFOECC Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: quoted-printable Forget about -C and the patch, this bug shows itself with pure install without -C too. install does not acts like 'ln -f'. Here is minimal test:= #!/bin/sh mkdir b install -l s b a echo Pass 1 ls -al a b install -l s b a echo echo Pass 2 ls -al a b # bug And its output (notice b -> b): Pass 1 lrwxr-xr-x 1 ache wheel 1 19 Feb 17:15 a -> b b: total 6 drwxr-xr-x 2 ache wheel 512 19 Feb 17:15 . drwxr-xr-x 32 ache wheel 2560 19 Feb 17:15 .. Pass 2 lrwxr-xr-x 1 ache wheel 1 19 Feb 17:15 a -> b b: total 6 drwxr-xr-x 2 ache wheel 512 19 Feb 17:15 . drwxr-xr-x 32 ache wheel 2560 19 Feb 17:15 .. lrwxr-xr-x 1 ache wheel 1 19 Feb 17:15 b -> b On 19.02.2013 15:29, Andrey Chernov wrote: > This patch makes install -C, -S and default (-c) to do the same for lin= ks,=20 > as 'ln -f'. Not well tested yes due to lack of time. >=20 > --- xinstall.c.bak 2013-02-19 15:20:16.000000000 +0400 > +++ xinstall.c 2013-02-19 15:24:30.000000000 +0400 > @@ -754,7 +754,7 @@ > target =3D (lstat(to_name, &to_sb) =3D=3D 0); > =20 > if (dolink) { > - if (target && !safecopy) { > + if (target) { > if (to_sb.st_mode & S_IFDIR && rmdir(to_name) =3D=3D -1) > err(EX_OSERR, "%s", to_name); > if (to_sb.st_flags & NOCHANGEBITS)=20 >=20 > On 19.02.2013 14:49, Andrey Chernov wrote: >> On 19.02.2013 2:55, Brooks Davis wrote: >>> On Sun, Feb 17, 2013 at 01:06:59PM +0000, Andrey A. Chernov wrote: >>>> Author: ache Date: Sun Feb 17 13:06:59 2013 New Revision: 246913 >>>> URL: http://svnweb.freebsd.org/changeset/base/246913 >>>> >>>> Log: In 'make hierarchy' don't install /sys/sys pointing to=20 >>>> usr/src/sys but just /sys pointing there >>> >>> Did you have the latest install sources when you hit this? It=20 >>> should be emulating "ln -sfh" which would do the right thing. >>> >>> -- Brooks >>> >> >> Yes, very latest current, just standing in /usr/src and typing 'make >> hierarchy' and fail. I suspect the difference which plays role is=20 >> make.conf:INSTALL=3Dinstall -C which is common practice since old >> days. I.e. it may don't delete old symlink with -C, but use it as >> directory instead. I can't check this right now, maybe later. >> >=20 >=20 ------enig2PXBHTTSFIGDJFVBFOECC Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (MingW32) iEYEARECAAYFAlEjfeMACgkQVg5YK5ZEdN3BKACcC8hhm6C4K/s718IZMPGQCyBD dlwAn35vqY3yZ82AYXjcyQLMVELbZgZx =lyS4 -----END PGP SIGNATURE----- ------enig2PXBHTTSFIGDJFVBFOECC--