From 7d09e1d76ed1e1d0459cb97aaae40b5cc75b3869 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Mon, 21 Sep 2020 18:09:23 +0200
Subject: [PATCH] Give public packages more priority over private packages
---
bob/devtools/bootstrap.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/bob/devtools/bootstrap.py b/bob/devtools/bootstrap.py
index b3e202d1..31fd8162 100644
--- a/bob/devtools/bootstrap.py
+++ b/bob/devtools/bootstrap.py
@@ -289,8 +289,8 @@ def get_channels(public, stable, server, intranet, group):
* not public and stable: returns both public and private stable channels
* not public and not stable: returns all channels
- Beta channels have priority over stable channels, if returned. Private
- channels have priority over public channles, if turned.
+ Beta channels have priority over stable channels, if returned. Public
+ channels have priority over private channles, if turned.
Args:
@@ -319,18 +319,19 @@ def get_channels(public, stable, server, intranet, group):
channels = []
+ # do not use '/public' urls for public channels
+ prefix = "/software/" + group
+ if not stable:
+ channels += [server + prefix + "/conda/label/beta"] # allowed betas
+
+ channels += [server + prefix + "/conda"]
+
if not public:
prefix = "/private"
if not stable: # allowed private channels
channels += [server + prefix + "/conda/label/beta"] # allowed betas
channels += [server + prefix + "/conda"]
- # do not use '/public' versions here
- prefix = "/software/" + group
- if not stable:
- channels += [server + prefix + "/conda/label/beta"] # allowed betas
- channels += [server + prefix + "/conda"]
-
return channels
--
GitLab