Skip to content

Commit

Permalink
[build] 'make reset' target will continue recursive operations if any…
Browse files Browse the repository at this point in the history
… fail (#4675)

This change allows the recursive `git clean` and `git reset` commands to continue even if they encounter an error in one of the submodules. Previously, if an error was encountered, the operation would terminate with a message similar to the following:

Stopping at 'src/sonic-mgmt-framework'; script returned non-zero status.
  • Loading branch information
jleveque committed Jun 1, 2020
1 parent ccd08f1 commit 336cf2a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile.work
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,8 @@ reset :
fi
git clean -xfdf;
git reset --hard;
git submodule foreach --recursive git clean -xfdf;
git submodule foreach --recursive git reset --hard;
git submodule foreach --recursive 'git clean -xfdf || true';
git submodule foreach --recursive 'git reset --hard || true';
git submodule update --init --recursive;
echo "Reset complete!";
else
Expand Down

0 comments on commit 336cf2a

Please sign in to comment.