diff --git a/NEWS b/NEWS index 4eaf262a4a981848d3e4939d605d149b8eceecde..4bc5878419197b6862be4cb76cb81ada2bad3c4e 100644 --- a/NEWS +++ b/NEWS @@ -270,6 +270,7 @@ documents those changes that are of interest to users and administrators. * Changes in Slurm 14.03.10 =========================== + -- Fix a few sacctmgr error messages. * Changes in Slurm 14.03.9 ========================== diff --git a/src/sacctmgr/archive_functions.c b/src/sacctmgr/archive_functions.c index 5a8757d3aaecdfdcb251c97646f3aa9598a57441..3091d43cf3f674e640aea89721e162198134635b 100644 --- a/src/sacctmgr/archive_functions.c +++ b/src/sacctmgr/archive_functions.c @@ -428,11 +428,11 @@ extern int sacctmgr_archive_dump(int argc, char *argv[]) if (arch_cond->archive_dir) { if (stat(arch_cond->archive_dir, &st) < 0) { exit_code = errno; - fprintf(stderr, " dump: Failed to stat %s: %m\n " + fprintf(stderr, " dump: Failed to stat %s: %s\n " "Note: For archive dump, " "the directory must be on " "the calling host.\n", - arch_cond->archive_dir); + arch_cond->archive_dir, slurm_strerror(errno)); return SLURM_ERROR; } @@ -456,10 +456,11 @@ extern int sacctmgr_archive_dump(int argc, char *argv[]) if (arch_cond->archive_script) { if (stat(arch_cond->archive_script, &st) < 0) { exit_code = errno; - fprintf(stderr, " dump: Failed to stat %s: %m\n " + fprintf(stderr, " dump: Failed to stat %s: %s\n " "Note: For archive dump, the script must be on " "the calling host.\n", - arch_cond->archive_script); + arch_cond->archive_script, + slurm_strerror(errno)); return SLURM_ERROR; } if (!(st.st_mode & S_IFREG)) { @@ -551,10 +552,10 @@ extern int sacctmgr_archive_load(int argc, char *argv[]) if (stat(arch_rec->archive_file, &st) < 0) { exit_code = errno; - fprintf(stderr, " load: Failed to stat %s: %m\n " + fprintf(stderr, " load: Failed to stat %s: %s\n " "Note: For archive load, the file must be on " "the calling host.\n", - arch_rec->archive_file); + arch_rec->archive_file, slurm_strerror(errno)); return SLURM_ERROR; } } diff --git a/src/sacctmgr/cluster_functions.c b/src/sacctmgr/cluster_functions.c index 2a41852bc73a17525a62f18364b03b6b4e1a0505..1fc18243611728ee78d88acb25dc531b68ca54d9 100644 --- a/src/sacctmgr/cluster_functions.c +++ b/src/sacctmgr/cluster_functions.c @@ -1099,7 +1099,8 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[]) acct_list = acct_storage_g_get_accounts(db_conn, my_uid, NULL); if ((fd = fopen(file_name,"w")) == NULL) { - fprintf(stderr, "Can't open file %s, %m\n", file_name); + fprintf(stderr, "Can't open file %s, %s\n", file_name, + slurm_strerror(errno)); FREE_NULL_LIST(acct_list); FREE_NULL_LIST(assoc_list); xfree(cluster_name); diff --git a/src/sacctmgr/file_functions.c b/src/sacctmgr/file_functions.c index b5c8ab9c0835cde5be8b69d5d393d517d5975754..77f21bcfc7f7048d373ff64d3e3ba2f37c27b76a 100644 --- a/src/sacctmgr/file_functions.c +++ b/src/sacctmgr/file_functions.c @@ -1935,7 +1935,8 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[]) xfree(file_name); if (fd == NULL) { exit_code=1; - fprintf(stderr, " Unable to read \"%s\": %m\n", argv[0]); + fprintf(stderr, " Unable to read \"%s\": %s\n", argv[0], + slurm_strerror(errno)); xfree(cluster_name); return; }