From 0cbc9810711208a4f939765a51f535b6b512ae60 Mon Sep 17 00:00:00 2001
From: Jani Nikula <jani.nikula@intel.com>
Date: Mon, 10 Aug 2015 16:41:03 +0300
Subject: [PATCH] dim: only source nightly.conf after sanity checks
---
dim | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/dim b/dim
index 7ffffea..f895580 100755
--- a/dim
+++ b/dim
@@ -97,9 +97,6 @@ addr_dri_devel="dri-devel@lists.freedesktop.org"
addr_intel_qa1="\"Sun, Yi\" <yi.sun@intel.com>"
addr_intel_qa2="\"Christophe Prigent\" <christophe.prigent@intel.com>"
-dim_branches=`(source $DIM_PREFIX/drm-intel-rerere/nightly.conf ; echo $nightly_branches) | \
- xargs -n 1 echo | grep '^origin' | sed -e 's/^origin\///'`
-
#
# Command line options.
#
@@ -155,6 +152,13 @@ if [ "$subcommand" != "setup" ]; then
done
fi
+#
+# Internal configuration that depends on a sane setup.
+#
+
+dim_branches=`(source $DIM_PREFIX/drm-intel-rerere/nightly.conf ; echo $nightly_branches) | \
+ xargs -n 1 echo | grep '^origin' | sed -e 's/^origin\///'`
+
function update_linux_next
{
cd $DIM_PREFIX/drm-intel-nightly
--
GitLab