repack: improve warnings about failure of renaming and removing files

stefanbeller · gitster · commit 0b63c6a5b78f · 2013-09-17T13:34:57.000-07:00
Signed-off-by: Stefan Beller &lt;stefanbeller@googlemail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/repack.c b/builtin/repack.c
@@ -327,7 +327,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 				chmod(fname_old, statbuffer.st_mode);
 			}
 			if (rename(fname_old, fname))
-				exit(errno);
+				die_errno(_("renaming '%s' failed"), fname_old);
 			free(fname);
 			free(fname_old);
 		}
@@ -341,7 +341,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 					packdir,
 					item->string,
 					exts[ext]);
-			remove_path(fname);
+			if (remove_path(fname))
+				warning(_("removing '%s' failed"), fname);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ int cmd_repack(int argc, const char *argv, const char prefix)`
`327`	`327`	`chmod(fname_old, statbuffer.st_mode);`
`328`	`328`	`}`
`329`	`329`	`if (rename(fname_old, fname))`
`330`		`- exit(errno);`
	`330`	`+ die_errno(_("renaming '%s' failed"), fname_old);`
`331`	`331`	`free(fname);`
`332`	`332`	`free(fname_old);`
`333`	`333`	`}`
`@@ -341,7 +341,8 @@ int cmd_repack(int argc, const char *argv, const char prefix)`
`341`	`341`	`packdir,`
`342`	`342`	`item->string,`
`343`	`343`	`exts[ext]);`
`344`		`- remove_path(fname);`
	`344`	`+ if (remove_path(fname))`
	`345`	`+ warning(_("removing '%s' failed"), fname);`
`345`	`346`	`}`
`346`	`347`	`}`
`347`	`348`