From owner-svn-src-all@FreeBSD.ORG Fri Apr 13 10:49:18 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1151B106564A; Fri, 13 Apr 2012 10:49:18 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by mx1.freebsd.org (Postfix) with ESMTP id 78E448FC08; Fri, 13 Apr 2012 10:49:17 +0000 (UTC) Received: by ggnk4 with SMTP id k4so1869149ggn.13 for ; Fri, 13 Apr 2012 03:49:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=Rc2C92j85/3+zrEjX+NKqHrzrUfFoCpkvP7FI+gcgs0=; b=nJtokKs6JNxRTOle6muKY8AvBqlDduYTwgLYMYE7tBLpwth8zJfGw1ru0rj79ITgxk 0EhXVbCV0KzlE+6MZjUbh4a0gDVaIUoYRkIFRrwgaQVAQvbicLbSBZ7FYCElgrR5j1Bv 2FdFjZBkRdMCu5aeJ1g6J6x4QihVbaVuoOe53bQPg99Zlpt7Bh21FwoLrwtOTLrfjhZI zd+rmV4CfUjGxPhuHs2sH8zj2uXHFoXBuVLUcjiXMTurDf9kvPCbay+PSPM3H5fWK6UC wkhrlrQOzOx9Y10yOF+I8o6fB4uOzPHTQvQOGPwseoZFXMDwe68Sg/WxkvCZbIkdX1b4 z+bQ== MIME-Version: 1.0 Received: by 10.236.200.228 with SMTP id z64mr1156463yhn.10.1334314156816; Fri, 13 Apr 2012 03:49:16 -0700 (PDT) Received: by 10.236.181.225 with HTTP; Fri, 13 Apr 2012 03:49:16 -0700 (PDT) In-Reply-To: <201204130739.q3D7dKFQ066260@svn.freebsd.org> References: <201204130739.q3D7dKFQ066260@svn.freebsd.org> Date: Fri, 13 Apr 2012 12:49:16 +0200 Message-ID: From: Oliver Pinter To: Andriy Gapon Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r234209 - in stable/9/sys: conf i386/conf kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 13 Apr 2012 10:49:18 -0000 Hi! Please MFC back this patch to 7 and 8 STABLE. On 4/13/12, Andriy Gapon wrote: > Author: avg > Date: Fri Apr 13 07:39:20 2012 > New Revision: 234209 > URL: http://svn.freebsd.org/changeset/base/234209 > > Log: > MFC r231558: newvers.sh: unbreak git/git-svn support > > Modified: > stable/9/sys/conf/newvers.sh > Directory Properties: > stable/9/sys/ (props changed) > stable/9/sys/amd64/include/xen/ (props changed) > stable/9/sys/boot/ (props changed) > stable/9/sys/boot/i386/efi/ (props changed) > stable/9/sys/boot/ia64/efi/ (props changed) > stable/9/sys/boot/ia64/ski/ (props changed) > stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) > stable/9/sys/boot/powerpc/ofw/ (props changed) > stable/9/sys/cddl/contrib/opensolaris/ (props changed) > stable/9/sys/conf/ (props changed) > stable/9/sys/contrib/dev/acpica/ (props changed) > stable/9/sys/contrib/octeon-sdk/ (props changed) > stable/9/sys/contrib/pf/ (props changed) > stable/9/sys/contrib/x86emu/ (props changed) > stable/9/sys/fs/ (props changed) > stable/9/sys/fs/ntfs/ (props changed) > stable/9/sys/i386/conf/XENHVM (props changed) > stable/9/sys/kern/subr_witness.c (props changed) > > Modified: stable/9/sys/conf/newvers.sh > ============================================================================== > --- stable/9/sys/conf/newvers.sh Fri Apr 13 07:18:19 2012 (r234208) > +++ stable/9/sys/conf/newvers.sh Fri Apr 13 07:39:20 2012 (r234209) > @@ -92,11 +92,15 @@ for dir in /bin /usr/bin /usr/local/bin; > svnversion=${dir}/svnversion > break > fi > - if [ -d "${SYSDIR}/../.git" -a -x "${dir}/git" ] ; then > - git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git" > - break > - fi > done > +if [ -d "${SYSDIR}/../.git" ] ; then > + for dir in /bin /usr/bin /usr/local/bin; do > + if [ -x "${dir}/git" ] ; then > + git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git" > + break > + fi > + done > +fi > > if [ -n "$svnversion" ] ; then > echo "$svnversion" > _______________________________________________ > svn-src-stable@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-stable > To unsubscribe, send any mail to "svn-src-stable-unsubscribe@freebsd.org" >