aboutsummaryrefslogtreecommitdiff
path: root/tmp/0004-lib-common-Changing-run_app-to-not-check-for-a-curre.patch
diff options
context:
space:
mode:
Diffstat (limited to 'tmp/0004-lib-common-Changing-run_app-to-not-check-for-a-curre.patch')
-rw-r--r--tmp/0004-lib-common-Changing-run_app-to-not-check-for-a-curre.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/tmp/0004-lib-common-Changing-run_app-to-not-check-for-a-curre.patch b/tmp/0004-lib-common-Changing-run_app-to-not-check-for-a-curre.patch
new file mode 100644
index 0000000..48e23de
--- /dev/null
+++ b/tmp/0004-lib-common-Changing-run_app-to-not-check-for-a-curre.patch
@@ -0,0 +1,53 @@
+From 90bc5af891b745f97196310f2bc4afd081daac3e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Trygve=20Laugst=C3=B8l?= <trygvis@inamo.no>
+Date: Fri, 1 Nov 2013 15:48:58 +0100
+Subject: [PATCH 4/5] lib/common: Changing run_app to not check for a 'current'
+ link if version is given. This will unbreak hooks that are run before a
+ current link is installed or if it has been removed.
+
+---
+ lib/common | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/lib/common b/lib/common
+index 369f0be..c2babd2 100755
+--- a/lib/common
++++ b/lib/common
+@@ -2,6 +2,7 @@
+
+ # Asserts that the cwd is an app directory.
+ # By default it checks that there is a 'current' link.
++# TODO: make check_link default to no if version is set
+ assert_is_app() {
+ local check_link=yes
+ local version=
+@@ -241,8 +242,8 @@ run_app() {
+ case $opt in
+ v)
+ version=$OPTARG
+- shift 2
+- OPTIND=1
++ shift 2
++ OPTIND=1
+ ;;
+ esac
+ done
+@@ -258,13 +259,13 @@ run_app() {
+ assert_is_app
+ cd current
+ else
+- assert_is_app -v "$version"
++ assert_is_app -C -v "$version"
+ cd "versions/$version"
+ fi
+
+ path=/bin:/usr/bin
+
+- # This magically get the expansion of $u correct.
++ # This will magically get the expansion of $u correct.
+ IFS="
+ "
+
+--
+1.8.4.rc3
+