Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the issue 'branch already exist' in rebuilds #3692

Merged
merged 1 commit into from
Nov 4, 2019

Conversation

pavel-shirshov
Copy link
Contributor

@pavel-shirshov pavel-shirshov commented Oct 31, 2019

- What I did
Fixed Makefile of FRR. Before we had issues after #3589:

  1. When you want to rebuild frr with new changes you get error "branch frr/7.1 is already exist".
  2. When your patch list is empty stg undo gives an error

- How I did it

  1. checkout to master branch after build.
  2. Using temporary stg branch with timestamp
  3. ignoring result code of stg undo

- How to verify it
make target/debs/stretch/frr_7.1-sonic-0_amd64.deb must work for you first
then
make target/debs/stretch/frr_7.1-sonic-0_amd64.deb-clean and
make target/debs/stretch/frr_7.1-sonic-0_amd64.deb must work for you again

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@lguohan lguohan merged commit d85777b into sonic-net:master Nov 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants