[gentoo-commits] gentoo-x86 commit in sys-apps/openrc/files/9999: 0002-useful-functions.patch 0001-msg-style.patch 0003-KV.patch

[Mike Frysinger (vapier)]

vapier      08/03/30 17:42:12

  Added:                0002-useful-functions.patch 0001-msg-style.patch
                        0003-KV.patch
  Log:
  Move patches here so we get them in releases.
  (Portage version: 2.2_pre5)

Revision  Changes    Path
1.1                  sys-apps/openrc/files/9999/0002-useful-functions.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0002-useful-functions.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0002-useful-functions.patch?rev=1.1&content-type=text/plain

Index: 0002-useful-functions.patch
===================================================================
From c5552432d21e964ea1dbda7415040259b87ea77e Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Mon, 24 Mar 2008 02:03:39 -0400
Subject: [PATCH] add a softlevel() function to the API so people dont have to worry about inner details and move get_bootparam back to the exported function.sh api

---
 sh/functions.sh.in    |   27 +++++++++++++++++++++++++++
 sh/rc-functions.sh.in |   22 ----------------------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/sh/functions.sh.in b/sh/functions.sh.in
index 1a1fbba..140f6dc 100644
--- a/sh/functions.sh.in
+++ b/sh/functions.sh.in
@@ -38,6 +38,33 @@ yesno()
 	esac
 }
 
+softlevel()
+{
+	echo $(rc-status --runlevel)
+}
+
+get_bootparam()
+{
+	local match="$1"
+	[ -z "${match}" -o ! -r /proc/cmdline ] && return 1
+
+	set -- $(cat /proc/cmdline)
+	while [ -n "$1" ]; do
+		case "$1" in
+			gentoo=*)
+				local params="${1##*=}"
+				local IFS=, x=
+				for x in ${params}; do
+					[ "${x}" = "${match}" ] && return 0
+				done
+				;;
+		esac
+		shift
+	done
+
+	return 1
+}
+
 _sanitize_path()
 {
 	local IFS=":" p= path=
diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in
index 74db71e..eb45e49 100644
--- a/sh/rc-functions.sh.in
+++ b/sh/rc-functions.sh.in
@@ -51,28 +51,6 @@ is_union_fs()
 	unionctl "$1" --list >/dev/null 2>&1
 }
 
-get_bootparam()
-{
-	local match="$1"
-	[ -z "${match}" -o ! -r /proc/cmdline ] && return 1
-
-	set -- $(cat /proc/cmdline)
-	while [ -n "$1" ]; do
-		case "$1" in
-			gentoo=*)
-				local params="${1##*=}"
-				local IFS=, x=
-				for x in ${params}; do
-					[ "${x}" = "${match}" ] && return 0
-				done
-				;;
-		esac
-		shift
-	done
-
-	return 1
-}
-
 # Add our sbin to $PATH
 case "${PATH}" in
 	@PREFIX@/lib/rc/sbin|@PREFIX@/lib/rc/sbin:*);;
-- 
1.5.4.4




1.1                  sys-apps/openrc/files/9999/0001-msg-style.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0001-msg-style.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0001-msg-style.patch?rev=1.1&content-type=text/plain

Index: 0001-msg-style.patch
===================================================================
From 1eddb56f11b41c4bf4f878c995c5d140b1f9d44d Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Mon, 24 Mar 2008 01:48:19 -0400
Subject: [PATCH] This reverts commit 0e2f160c95b15e95f3885e3f5a3670ec5ae0a709. 2 spaces in 80 cols has never made any sort of realistic difference and we're not going to change this behavior in Gentoo.

---
 src/libeinfo/libeinfo.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c
index f8ddcb5..c46cacb 100644
--- a/src/libeinfo/libeinfo.c
+++ b/src/libeinfo/libeinfo.c
@@ -787,7 +787,7 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
 	if (! msg)
 		return;
 
-	cols = get_term_columns(fp) - (strlen(msg) + 3);
+	cols = get_term_columns(fp) - (strlen(msg) + 5);
 
 	/* cons25 is special - we need to remove one char, otherwise things
 	 * do not align properly at all. */
@@ -801,18 +801,15 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
 	if (term_is_cons25)
 		cols--;
 
-	/* If extra spacing is required around msg, then please change
-	 * via a runtime knob and leave this default as is as it saves 2 
-	 * valuable columns when running on 80 column screens. */
 	if (cols > 0 && colour_terminal(fp)) {
-		fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols),
+		fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols),
 			ecolor(ECOLOR_BRACKET), ecolor(color), msg,
 			ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL));
 	} else {
 		if (col > 0)
 			for (i = 0; i < cols - col; i++)
 				fprintf(fp, " ");
-		fprintf(fp, " [%s]\n", msg);
+		fprintf(fp, " [ %s ]\n", msg);
 	}
 }
 
-- 
1.5.4.4




1.1                  sys-apps/openrc/files/9999/0003-KV.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0003-KV.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0003-KV.patch?rev=1.1&content-type=text/plain

Index: 0003-KV.patch
===================================================================
From dac703b26c71cd8479b71d101c4e1ddb8eadc194 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Mon, 24 Mar 2008 03:14:02 -0400
Subject: [PATCH] add back KV_* funcs

---
 sh/functions.sh.in |   35 +++++++++++++++++++++++++++++++++++
 sh/runtests.sh     |   45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 0 deletions(-)

diff --git a/sh/functions.sh.in b/sh/functions.sh.in
index 140f6dc..0522792 100644
--- a/sh/functions.sh.in
+++ b/sh/functions.sh.in
@@ -65,6 +65,41 @@ get_bootparam()
 	return 1
 }
 
+KV_major() {
+	[ -z "$*" ] && return 1
+	local KV="$*"
+	echo ${KV%%.*}
+}
+
+KV_minor() {
+	[ -z "$*" ] && return 1
+	local KV="$*"
+	KV=${KV#*.}
+	echo ${KV%%.*}
+}
+
+KV_micro() {
+	[ -z "$*" ] && return 1
+	local KV="$*"
+	KV=${KV#*.*.}
+	echo ${KV%%[![:digit:]]*}
+}
+
+KV_to_int() {
+	[ -z "$*" ] && return 1
+	local KV_MAJOR="$(KV_major "$*")"
+	local KV_MINOR="$(KV_minor "$*")"
+	local KV_MICRO="$(KV_micro "$*")"
+	local KV_int="$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))"
+	echo "${KV_int}"
+}
+
+_RC_GET_KV_CACHE=""
+get_KV() {
+	[ -z ${_RC_GET_KV_CACHE} ] && _RC_GET_KV_CACHE=$(uname -r)
+	echo $(KV_to_int "${_RC_GET_KV_CACHE}")
+}
+
 _sanitize_path()
 {
 	local IFS=":" p= path=
diff --git a/sh/runtests.sh b/sh/runtests.sh
index d0d6a17..debcf4f 100755
--- a/sh/runtests.sh
+++ b/sh/runtests.sh
@@ -3,6 +3,19 @@
 top_srcdir=${top_srcdir:-..}
 . ${top_srcdir}/test/setup_env.sh
 
+checkit() {
+	local output=$($1 $3)
+	local lret=$?
+	if [ ${lret} -ne 0 ] ; then
+		((tret+=lret))
+		echo "FAIL: exec: $*"
+	fi
+	if [ "${output}" != "$2" ] ; then
+		((tret+=lret))
+		echo "FAIL: output: $* : got='${output}' wanted='$2'"
+	fi
+}
+
 ret=0
 
 tret=0
@@ -22,4 +35,36 @@ done
 eend ${tret}
 ((ret+=tret))
 
+compare_int() {
+	local got=$(KV_to_int $1)
+	local exp=$(KV_to_int $3)
+	if ! [ ${got} $2 ${exp} ] ; then
+		((tret+=1))
+		echo "FAIL: KV_to_int '${v}'(${got}) $2 '1.2.2'(${exp})"
+	fi
+}
+
+tret=0
+ebegin "Testing KV_{major,minor,micro,to_int}"
+for v in \
+	1.2.3 1.2.3-rc0 1.2.3_rc0 "1.2.3 rc0" \
+	1.2.3.4 1.2.3.4-rc0 1.2.3.4_rc0 "1.2.3.4 rc0"
+do
+	checkit KV_major 1 ${v}
+	checkit KV_minor 2 ${v}
+	checkit KV_micro 3 ${v}
+
+	compare_int 1.2.2 -lt ${v}
+	compare_int 1.2.2.10 -lt ${v}
+	compare_int 1.2.4 -gt ${v}
+	compare_int 1.2.4-rc0 -gt ${v}
+	compare_int 1.2.3 -eq ${v}
+	compare_int 1.2.3-rc0 -eq ${v}
+	compare_int 1.2.3.2 -eq ${v}
+	compare_int 1.2.3.3 -eq ${v}
+	compare_int 1.2.3.4 -eq ${v}
+done
+eend ${tret}
+((ret+=tret))
+
 exit ${ret}
-- 
1.5.4.4




-- 
gentoo-commits@l.g.o mailing list