lcov: Fix .build_directory file not being deleted

oberpar · oberpar · commit a2a8b376ec5e · 2015-06-17T17:34:33.000+02:00
Using option --to-package while capturing coverage data creates a
temporary file named ".build_directory". Currently this file is not
properly removed at the end of processing due to a changed CWD. This
patch fixes this problem by reverting to the original CWD before trying
to remove the temporary file.

Signed-off-by: Peter Oberparleiter &lt;oberpar@linux.vnet.ibm.com&gt;
diff --git a/bin/lcov b/bin/lcov
@@ -1050,6 +1050,7 @@ sub create_package($$$;$)
 	chdir($dir);
 	system("tar cfz $file .")
 		and die("ERROR: could not create package $file\n");
+	chdir($cwd);
 
 	# Remove temporary files
 	unlink("$dir/$pkg_build_file");
@@ -1063,7 +1064,6 @@ sub create_package($$$;$)
 			info("  data files ...........: $count\n");
 		}
 	}
-	chdir($cwd);
 }
 
 sub find_link_fn($$$)

Original file line number	Diff line number	Diff line change
`@@ -1050,6 +1050,7 @@ sub create_package($$$;$)`
`1050`	`1050`	`chdir($dir);`
`1051`	`1051`	`system("tar cfz $file .")`
`1052`	`1052`	`and die("ERROR: could not create package $file\n");`
	`1053`	`+ chdir($cwd);`
`1053`	`1054`
`1054`	`1055`	`# Remove temporary files`
`1055`	`1056`	`unlink("$dir/$pkg_build_file");`
`@@ -1063,7 +1064,6 @@ sub create_package($$$;$)`
`1063`	`1064`	`info(" data files ...........: $count\n");`
`1064`	`1065`	`}`
`1065`	`1066`	`}`
`1066`		`- chdir($cwd);`
`1067`	`1067`	`}`
`1068`	`1068`
`1069`	`1069`	`sub find_link_fn($$$)`