Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 15 Jul 2001 16:27:42 -0700 (PDT)
From:      John Polstra <jdp@polstra.com>
To:        stable@freebsd.org
Cc:        jon@witchspace.com
Subject:   Re: [Q] Mergemaster problem
Message-ID:  <200107152327.f6FNRgA17282@vashon.polstra.com>
In-Reply-To: <3B50671A.B8FBBD7B@witchspace.com>
References:  <3B50671A.B8FBBD7B@witchspace.com>

next in thread | previous in thread | raw e-mail | index | archive | help
In article <3B50671A.B8FBBD7B@witchspace.com>,
Jonathan Belson  <jon@witchspace.com> wrote:
> I've just upgraded my machine to a more recent version
> of -stable.  Everything went swimmingly until I ran
> mergemaster...whenever I try to install an updated file
> I get an error, eg.
> 
> *** Problem installing ./etc/defaults/pccard.conf, it will remain to
> merge by hand         

This bug appears to have been introduced in revision 1.6.2.7, which
added "&& [ -f "${1}" ] && rm "${1}"" onto the invocations of
"install", like this:

    install -m "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" &&
      [ -f "${1}" ] && rm "${1}"

Since install is not given the "-c" option, it deletes the source copy
of the file.  That causes the ``[ -f "${1}" ]'' to fail, so it appears
that the installation failed.  I reported this to the maintainer
today.

Don't worry about it -- the files are actually installed despite the
error messages.

John
-- 
  John Polstra                                               jdp@polstra.com
  John D. Polstra & Co., Inc.                        Seattle, Washington USA
  "Disappointment is a good sign of basic intelligence."  -- Chögyam Trungpa


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200107152327.f6FNRgA17282>