Merge remote-tracking branch 'origin/slurm-14.03' into slurm-14.11

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
 ==========================

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;
 		}
 	}

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);

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;
 	}