[gentoo-commits] gentoo-x86 commit in net-wireless/iw/files: iw-3.10-versioncheck.patch iw-3.2_libnl-3x-compile.diff

[Bjarke Istrup Pedersen (gurligebis)]

gurligebis    13/09/01 17:40:18

  Added:                iw-3.10-versioncheck.patch
  Removed:              iw-3.2_libnl-3x-compile.diff
  Log:
  Adding workaround for .git directory in parent folder, fixing bug #482334
  
  (Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 15AE484C)

Revision  Changes    Path
1.1                  net-wireless/iw/files/iw-3.10-versioncheck.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/iw/files/iw-3.10-versioncheck.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/iw/files/iw-3.10-versioncheck.patch?rev=1.1&content-type=text/plain

Index: iw-3.10-versioncheck.patch
===================================================================
From 2b60b435dd032572c556b064295a3e3607d00a55 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <fschmaus@×××××.com>
Date: Sun, 1 Sep 2013 17:57:21 +0200
Subject: [PATCH] Don't get iw version from git if there is no .git/

The version.sh script should only try to get the version from git if the
source actually resides in a git repository, i.e. .git/ exists. Doing
otherwise in a non-git source repo results in git ascending until it
finds a .git directory, which will cause problems in some source-based
distributions ( https://bugs.gentoo.org/show_bug.cgi?id=482334 ).
---
 version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.sh b/version.sh
index 80e55ab..0f1aa1d 100755
--- a/version.sh
+++ b/version.sh
@@ -3,7 +3,7 @@
 VERSION="3.11"
 OUT="$1"
 
-if head=`git rev-parse --verify HEAD 2>/dev/null`; then
+if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
 	git update-index --refresh --unmerged > /dev/null
 	descr=$(git describe)
 
-- 
1.8.1.5