[SCM] Debian Qt/KDE packaging tools branch, experimental, updated. debian/0.15.5-1-g5cb2418

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-tools.git;a=commitdiff;h=5cb2418

The following commit has been merged in the experimental branch:
commit 5cb2418f43ed97348976df167042b7487742c39e
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun Apr 21 23:02:58 2013 +0200

    pkgkde-git: Update sanity check, allow git clones inside gited homes.
---
 debian/changelog |    6 ++++++
 vcslib/git.sh    |   18 +++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72ae35f..58fb2d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pkg-kde-tools (0.15.6) UNRELEASED; urgency=low
+
+  * pkgkde-git: Update sanity check, allow git clones inside gited homes.
+
+ -- Maximiliano Curia <maxy at debian.org>  Sun, 21 Apr 2013 22:58:09 +0200
+
 pkg-kde-tools (0.15.5) experimental; urgency=low
 
   * dh_sameversiondep: do not fail on dependencies which have versions from
diff --git a/vcslib/git.sh b/vcslib/git.sh
index 1c55ee9..4f46993 100644
--- a/vcslib/git.sh
+++ b/vcslib/git.sh
@@ -147,22 +147,22 @@ fi
 # Do some envinronment sanity checks first
 git_is_bare="$(git rev-parse --is-bare-repository 2>/dev/null)"
 if [ "$?" -eq 0 ]; then
-    if [ -z "$subcmd_needs_package_root" ]; then
-        is_valid_package_root "$PACKAGE_ROOT" ||
-            die "$subcmd should not be executed inside a valid debian packaging repository"
-    fi
-
     if [ "$git_is_bare" = "true" ]; then
         die "bare Git repositories are not supported."
     fi
 
     PACKAGE_ROOT="$(readlink -f "$(git rev-parse --git-dir)/..")"
 
-    is_valid_package_root "$PACKAGE_ROOT" ||
-        die "$PACKAGE_ROOT does NOT appear to be a valid debian packaging repository"
+    if [ -z "$subcmd_needs_package_root" ]; then
+        is_valid_package_root "$PACKAGE_ROOT" &&
+            die "$subcmd should not be executed inside a valid debian packaging repository"
+    else
+        is_valid_package_root "$PACKAGE_ROOT" ||
+            die "$PACKAGE_ROOT does NOT appear to be a valid debian packaging repository"
 
-    # Get info about debian package
-    get_debian_package_info "$PACKAGE_ROOT"
+        # Get info about debian package
+        get_debian_package_info "$PACKAGE_ROOT"
+    fi
 else
     if [ -n "$subcmd_needs_package_root" ]; then
         die "$subcmd should be executed inside a valid debian packaging git repository"

-- 
Debian Qt/KDE packaging tools