Merge lp:~seb128/unity-control-center/users-no-debug-output into lp:unity-control-center

Proposed by Sebastien Bacher
Status: Superseded
Proposed branch: lp:~seb128/unity-control-center/users-no-debug-output
Merge into: lp:unity-control-center
Diff against target: 18 lines (+2/-1)
1 file modified
panels/user-accounts/um-utils.c (+2/-1)
To merge this branch: bzr merge lp:~seb128/unity-control-center/users-no-debug-output
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Robert Ancell Needs Fixing
Review via email: mp+211613@code.launchpad.net

Commit message

users: don't display the ecryptfs-verify output on stdout

Description of the change

users: don't display the ecryptfs-verify output on stdout

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Does it leak anything important of just annoying?

review: Approve
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Shouldn't you free nostdout?

review: Needs Fixing
Revision history for this message
Sebastien Bacher (seb128) wrote :

> Shouldn't you free nostdout?

indeed, thanks for catching that, should teach me to want to push a change when I'm already late rather than doing it properly later!

Revision history for this message
Sebastien Bacher (seb128) wrote :

(sorry pushed by mistake to trunk, I reverted that and I'm changing to status back)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
12759. By Sebastien Bacher

correct the spacing

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panels/user-accounts/um-utils.c'
2--- panels/user-accounts/um-utils.c 2014-02-21 15:48:18 +0000
3+++ panels/user-accounts/um-utils.c 2014-03-18 19:45:42 +0000
4@@ -777,12 +777,13 @@
5 int status;
6 gchar *prog;
7 gchar *cmd;
8+ gchar *nostdout = NULL;
9
10 prog = g_find_program_in_path ("ecryptfs-verify");
11 if (prog != NULL) {
12 gchar *cmd = g_strdup_printf("'%s' -h -u '%s'", prog, name);
13
14- if (g_spawn_command_line_sync (cmd, NULL, NULL, &status, NULL)) {
15+ if (g_spawn_command_line_sync (cmd, &nostdout, NULL, &status, NULL)) {
16 if (status == 0)
17 using_ecryptfs = TRUE;
18 }

Subscribers

People subscribed via source and target branches