[systemd-commits] 2 commits - src/systemctl.c src/test-login.c

[Lennart Poettering]

 src/systemctl.c  |    4 ++--
 src/test-login.c |   24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit b9b2b042c5564dfff730eeab43db9ac4bbe4c650
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Jul 30 16:42:26 2011 +0200

    sd-login: build test code again

diff --git a/src/test-login.c b/src/test-login.c
index 59b46a1..7d6f082 100644
--- a/src/test-login.c
+++ b/src/test-login.c
@@ -149,22 +149,22 @@ int main(int argc, char* argv[]) {
         printf("n_uids = %i\n", r);
         assert_se(sd_get_uids(NULL) == r);
 
-        /* r = sd_login_monitor_new("session", &m); */
-        /* assert_se(r >= 0); */
+        r = sd_login_monitor_new("session", &m);
+        assert_se(r >= 0);
 
-        /* zero(pollfd); */
-        /* pollfd.fd = sd_login_monitor_get_fd(m); */
-        /* pollfd.events = POLLIN; */
+        zero(pollfd);
+        pollfd.fd = sd_login_monitor_get_fd(m);
+        pollfd.events = POLLIN;
 
-        /* for (n = 0; n < 5; n++) { */
-        /*         r = poll(&pollfd, 1, -1); */
-        /*         assert_se(r >= 0); */
+        for (n = 0; n < 5; n++) {
+                r = poll(&pollfd, 1, -1);
+                assert_se(r >= 0);
 
-        /*         sd_login_monitor_flush(m); */
-        /*         printf("Wake!\n"); */
-        /* } */
+                sd_login_monitor_flush(m);
+                printf("Wake!\n");
+        }
 
-        /* sd_login_monitor_unref(m); */
+        sd_login_monitor_unref(m);
 
         return 0;
 }

commit ecdcbc5e607a324004877de1937026daa7f7b6cc
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Jul 30 16:42:05 2011 +0200

    systemctl: s/ignore/ignore_error/ in 'show' output

diff --git a/src/systemctl.c b/src/systemctl.c
index 620b91f..bf905ca 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -2452,7 +2452,7 @@ static int print_property(const char *name, DBusMessageIter *iter) {
 
                                 if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &path, true) >= 0 &&
                                     bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_BOOLEAN, &ignore, false) >= 0)
-                                        printf("EnvironmentFile=%s (ignore=%s)\n", path, yes_no(ignore));
+                                        printf("EnvironmentFile=%s (ignore_errors=%s)\n", path, yes_no(ignore));
 
                                 dbus_message_iter_next(&sub);
                         }
@@ -2517,7 +2517,7 @@ static int print_property(const char *name, DBusMessageIter *iter) {
 
                                         t = strv_join(info.argv, " ");
 
-                                        printf("%s={ path=%s ; argv[]=%s ; ignore=%s ; start_time=[%s] ; stop_time=[%s] ; pid=%u ; code=%s ; status=%i%s%s }\n",
+                                        printf("%s={ path=%s ; argv[]=%s ; ignore_errors=%s ; start_time=[%s] ; stop_time=[%s] ; pid=%u ; code=%s ; status=%i%s%s }\n",
                                                name,
                                                strna(info.path),
                                                strna(t),