Merge lp:~wlxing/ecryptfs/fix-command-termination into lp:ecryptfs

Proposed by Jason Xing
Status: Merged
Merge reported by: Jason Xing
Merged at revision: not available
Proposed branch: lp:~wlxing/ecryptfs/fix-command-termination
Merge into: lp:ecryptfs
Diff against target: 24 lines (+2/-1)
2 files modified
debian/changelog (+2/-0)
src/utils/ecryptfs-recover-private (+0/-1)
To merge this branch: bzr merge lp:~wlxing/ecryptfs/fix-command-termination
Reviewer Review Type Date Requested Status
Tyler Hicks Approve
Review via email: mp+325359@code.launchpad.net

Description of the change

src/utils/ecryptfs-recover-private: Prevent ecryptfs-recover-private command is terminated because of printing warnings. So just get rid of line "exit 1" in the warn() function.

To post a comment you must log in.
Revision history for this message
Tyler Hicks (tyhicks) wrote :

Nice catch!

I've dropped the entry that you added to debian/changelog since this is fixing a bug that I introduced in the development cycle. We only need to put user facing changes into debian/changelog and fixing a bug that was introduced after the last official release is not typically user facing.

Thanks again for catching and fixing my mistake here. :)

review: Approve
Revision history for this message
Jason Xing (wlxing) wrote :

I got it! Now I learn more about the debian/changelog. Thanks.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-06-08 23:29:22 +0000
3+++ debian/changelog 2017-06-09 03:47:14 +0000
4@@ -36,6 +36,8 @@
5 users that even though the mount was successful, their data may not be
6 decrypted when a mount passphrase was used for recovery
7 (LP: #1694272, LP: #1439825)
8+ * src/utils/ecryptfs-recover-private: Fix command is terminated because of
9+ "exit 1" in warn() function. So just get rid of it.
10
11 [ Jelle van der Waa ]
12 * src/key_mod/ecryptfs_key_mod_openssl.c,
13
14=== modified file 'src/utils/ecryptfs-recover-private'
15--- src/utils/ecryptfs-recover-private 2017-06-08 23:29:22 +0000
16+++ src/utils/ecryptfs-recover-private 2017-06-09 03:47:14 +0000
17@@ -24,7 +24,6 @@
18
19 warn() {
20 echo "WARNING: $@" 1>&2
21- exit 1
22 }
23
24 info() {

Subscribers

People subscribed via source and target branches