commit 15c84760ebe3f2677d1212aa00ef6f7485446a69 Author: Nicolas Vigier boklm@torproject.org Date: Wed Oct 28 22:21:16 2020 +0100

Bug 40008: Fix caching of the exec template function

In ce6b9136fc9e006536b we added caching of the exec template function, however we didn't take the project into account. --- lib/RBM.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/RBM.pm b/lib/RBM.pm index 825502a..074e385 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -483,7 +483,7 @@ sub execute { if (project_config($project, 'git_url', $options)) { my $git_hash = project_config($project, 'git_hash', $options) || exit_error "No git_hash specified for project $project"; - $res_name = "git-$git_hash-$cmd"; + $res_name = "git-$project-/-$git_hash-/-$cmd"; return $cache{$res_name} if exists $cache{$res_name}; git_clone_fetch_chdir($project, $options); my ($stdout, $stderr, $success, $exit_code) @@ -500,7 +500,7 @@ sub execute { } elsif (project_config($project, 'hg_url', $options)) { my $hg_hash = project_config($project, 'hg_hash', $options) || exit_error "No hg_hash specified for project $project"; - $res_name = "hg-$hg_hash-$cmd"; + $res_name = "hg-$project-/-$hg_hash-/-$cmd"; return $cache{$res_name} if exists $cache{$res_name}; hg_clone_fetch_chdir($project, $options); my ($stdout, $stderr, $success, $exit_code)