mirrors/sbopkg
2
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-11-09 19:50:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

sqg: Fix sqg detection of which repo it should use

Browse Source 
If the master or current repos are used and someone switches back to
a stable SBo version, sqg will not use the stable version without
deleting the other repo(s) since it simply checks for the .git folder
first. If it is found, it never attempts to switch to the repo set
for sbopkg.

This change adds detection for the "master" and "current" repos and
will ensure sqg uses the proper repo that is set in /etc/sbopkg.conf
or /root/.sbopkg.conf.

Signed-off-by: Willy Sudiarto Raharjo <willysr@sbopkg.org>
This commit is contained in:
Jeremy Hansen 2022-03-15 22:35:26 -06:00 committed by Willy Sudiarto Raharjo
parent e53096c20c
commit e4eede9f7b
No known key found for this signature in database
GPG Key ID: 3F617144D7238786
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/usr/libexec/sbopkg/sqg/functions
View File

@ -27,7 +27,7 @@ sanity_checks () {
fi fi
# check whether we are using git or rsync # check whether we are using git or rsync
if [ -d $REPO_ROOT/$REPO_NAME/.git ]; then if [ $REPO_BRANCH == "master" ] || [ $REPO_BRANCH == "current" ]; then
REPO_SUBPATH=$REPO_NAME REPO_SUBPATH=$REPO_NAME
else else
REPO_SUBPATH=$REPO_NAME/$REPO_BRANCH REPO_SUBPATH=$REPO_NAME/$REPO_BRANCH

4
tools/ChangeLog-latest.txt
View File

@ -1,8 +1,10 @@
SBOPKG NEWS SBOPKG NEWS
sbopkg-devel (2022-03-12 03:20 UTC) sbopkg-devel (2022-03-16 11:56 UTC)
MODIFICATIONS MODIFICATIONS
* Update renames * Update renames
* sqg: Fix repo detection when people switch from stable to master or vice versa
Patch by Jeremy Hansen (#77)
sbopkg 0.38.2 (2022-03-10 16:29 UTC) sbopkg 0.38.2 (2022-03-10 16:29 UTC)
FEATURES FEATURES