[med-svn] [aghermann] 16/23: prettify stale session lock message

andrei zavada hmmr-guest at moszumanska.debian.org
Wed Jan 4 22:59:26 UTC 2017


This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to tag 1.1.2
in repository aghermann.

commit 796676a0e644ee88b7619799e8507ee40fdf9140
Author: Andrei Zavada <hmmr at frdg>
Date:   Tue Jan 3 05:54:02 2017 +0200

    prettify stale session lock message
---
 upstream/src/aghermann/expdesign/expdesign.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstream/src/aghermann/expdesign/expdesign.cc b/upstream/src/aghermann/expdesign/expdesign.cc
index e466318..1cf7a66 100644
--- a/upstream/src/aghermann/expdesign/expdesign.cc
+++ b/upstream/src/aghermann/expdesign/expdesign.cc
@@ -120,9 +120,9 @@ CExpDesign (const string& session_dir_,
                 if ( stst == 0 ) {
                         const char *lock_mtime_s = ctime( &stat0.st_mtime);
                         throw invalid_argument
-                                (sasprintf("A lock file exists:\n<i>%s</i>,\ncreated %.*s).\n\n"
+                                (sasprintf("A lock file exists (created %.*s):\n\n<i>%s</i>\n\n"
                                            "If this lock is stale, delete it and try again.",
-                                           lock_fname.c_str(), (int)strlen(lock_mtime_s)-1, lock_mtime_s));
+                                           (int)strlen(lock_mtime_s)-1, lock_mtime_s, lock_fname.c_str()));
                 }
                 open( lock_fname.c_str(), O_WRONLY|O_CREAT|O_TRUNC, 0600);
                 stst = stat( lock_fname.c_str(), &stat0);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git



More information about the debian-med-commit mailing list