synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pmb.helpers.git.get_branches_official: accept Alpine stable branches 

Currently when you run 'pmbootstrap aportgen --fork $package' on v20.05
branch, the Alpine 3.12-stable branch gets checked out. But running
'pmbootstrap pull' afterwards means that the branch doesn't get updated
because that branch isn't accepted by the pull code.
Add 3.12-stable and a couple of releases afterwards to the accepted
branches for aports_upstream.
This commit is contained in:
Luca Weiss 2020-08-30 17:26:56 +02:00
parent 86d61b8012
commit 1fe65fe14e
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pmb/helpers/git.py
View File

@ -154,6 +154,9 @@ def get_branches_official(args, name_repo):
# This functions gets called with pmaports and aports_upstream, because
# both are displayed in "pmbootstrap status". But it only makes sense
# to display pmaports there, related code will be refactored soon (#1903).
if name_repo == "aports_upstream":
# Also accept 3.*-stable branches for Alpine Linux aports
return ["master"] + [f"3.{i}-stable" for i in range(12, 20)]
if name_repo != "pmaports":
return ["master"]