[gentoo-commits] proj/openrc:openrc-0.10.x commit in: src/rc/

[gentoo-commits] proj/openrc:openrc-0.10.x commit in: src/rc/

[William Hubbs]

commit:     28c13790ff7aba6a7f170b9b091b28648d4948a7
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 23:32:01 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu May 24 15:36:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=28c13790

rc: fix inverted string compare logic

X-Gentoo-Bug: 417227
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=417227
Reported-by: sphakka <marcoep <AT> gmail.com>
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 src/rc/rc-applets.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/rc/rc-applets.c b/src/rc/rc-applets.c
index 4bc5bdb..4481b08 100644
--- a/src/rc/rc-applets.c
+++ b/src/rc/rc-applets.c
@@ -343,7 +343,7 @@ do_mark_service(int argc, char **argv)
 	if (service == NULL || *service == '\0')
 		eerrorx("%s: no service specified", applet);
 
-	if (strncmp(applet, "mark_", 5) &&
+	if (!strncmp(applet, "mark_", 5) &&
 	    (bit = lookup_service_state(applet + 5)))
 		ok = rc_service_mark(service, bit);
 	else

[gentoo-commits] proj/openrc:openrc-0.10.x commit in: src/rc/

[William Hubbs]

commit:     eb07d1169f2d6bf9f97ea9efd660936dff6453d8
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 18 21:21:40 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Sep  9 23:44:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=eb07d116

Fix quiet usage

EINFO_QUIET will always been unset when we first do unsetenv("EINFO_QUIET") and
later query it again anyway..

---
 src/rc/mountinfo.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/rc/mountinfo.c b/src/rc/mountinfo.c
index e5d1d3f..eaace13 100644
--- a/src/rc/mountinfo.c
+++ b/src/rc/mountinfo.c
@@ -393,8 +393,7 @@ mountinfo(int argc, char **argv)
 	bool quiet;
 	char *this_path;
 
-	/* Ensure that we are only quiet when explicitly told to be */
-	unsetenv("EINFO_QUIET");
+	quiet = rc_yesno(getenv("EINFO_QUIET"));
 
 #define DO_REG(_var)							      \
 	if (_var) free(_var);						      \
@@ -475,7 +474,6 @@ mountinfo(int argc, char **argv)
 	REG_FREE(args.skip_options_regex);
 
 	result = EXIT_FAILURE;
-	quiet = rc_yesno(getenv("EINFO_QUIET"));
 
 	/* We should report the mounts in reverse order to ease unmounting */
 	TAILQ_FOREACH_REVERSE(s, nodes, rc_stringlist, entries) {