diff options
| author | Papoteur <papoteur@mageia.org> | 2024-05-16 15:07:01 +0200 |
|---|---|---|
| committer | Papoteur <papoteur@mageia.org> | 2024-05-16 15:07:01 +0200 |
| commit | 02ffba0d0c97f67f66f6f646279e2e7c2a39090d (patch) | |
| tree | 129c792b23db313100e91126872c2905ab8ff447 | |
| parent | d7b3c45d43f1a44c146e87830f50c1f2b63c220c (diff) | |
| parent | 0761635667b2b33ec55ae616d6db0b72b9650043 (diff) | |
| download | mgarepo-02ffba0d0c97f67f66f6f646279e2e7c2a39090d.tar mgarepo-02ffba0d0c97f67f66f6f646279e2e7c2a39090d.tar.gz mgarepo-02ffba0d0c97f67f66f6f646279e2e7c2a39090d.tar.bz2 mgarepo-02ffba0d0c97f67f66f6f646279e2e7c2a39090d.tar.xz mgarepo-02ffba0d0c97f67f66f6f646279e2e7c2a39090d.zip | |
Merge branch 'master' of git://git.mageia.org/software/build-system/mgarepo
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | MgaRepo/binrepo.py | 4 | ||||
| -rw-r--r-- | MgaRepo/commands/maintdb.py | 2 | ||||
| -rw-r--r-- | MgaRepo/util.py | 2 | ||||
| -rw-r--r-- | mgarepo.conf | 4 |
5 files changed, 9 insertions, 6 deletions
@@ -1,3 +1,6 @@ +* X +- use https: URLs by default + * 1.14.6 - add a progress bar for upload binaries - bash-completion: remove executable bit diff --git a/MgaRepo/binrepo.py b/MgaRepo/binrepo.py index d96507c..a66df09 100644 --- a/MgaRepo/binrepo.py +++ b/MgaRepo/binrepo.py @@ -58,7 +58,7 @@ def download_binary(topdir, sha1, filename): fmt = config.get("global", "download-command", "wget -c -O '$dest' $url") url = config.get("binrepo", "download_url", - "http://binrepo.mageia.org/") + "https://binrepo.mageia.org/") url = mirror.normalize_path(url + "/" + sha1) dest = os.path.join(topdir, 'SOURCES', filename) if os.path.exists(dest): @@ -88,7 +88,7 @@ def download_binaries(topdir): def binary_exists(sha1sum): dlurl = config.get("binrepo", "download_url", - "http://binrepo.mageia.org/") + "https://binrepo.mageia.org/") dlurl = mirror.normalize_path(dlurl + "/" + sha1sum) h = httplib2.Http() resp, content = h.request(dlurl, 'HEAD') diff --git a/MgaRepo/commands/maintdb.py b/MgaRepo/commands/maintdb.py index 920ff37..e3d54fe 100644 --- a/MgaRepo/commands/maintdb.py +++ b/MgaRepo/commands/maintdb.py @@ -33,7 +33,7 @@ def parse_options(): def maintdb(maintdb_args): host = config.get("maintdb", "host", "maintdb.mageia.org") if (maintdb_args[0] == 'get' and len(maintdb_args)>=2): - url = config.get("maintdb", "url", "http://maintdb.mageia.org/") + url = config.get("maintdb", "url", "https://maintdb.mageia.org/") import urllib.request try: page=urllib.request.urlopen(url + maintdb_args[1]) diff --git a/MgaRepo/util.py b/MgaRepo/util.py index 635319d..519c199 100644 --- a/MgaRepo/util.py +++ b/MgaRepo/util.py @@ -179,7 +179,7 @@ def rellink(src, dst): def maintdb_get(package): dlurl = config.get("maintdb", "url", - "http://maintdb.mageia.org/") + "https://maintdb.mageia.org/") dlurl = dlurl + "/" + package h = httplib2.Http() resp, content = h.request(dlurl, 'GET') diff --git a/mgarepo.conf b/mgarepo.conf index 932fa0d..d21dcf5 100644 --- a/mgarepo.conf +++ b/mgarepo.conf @@ -24,10 +24,10 @@ host = pkgsubmit.mageia.org default = Cauldron [binrepo] -download_url = http://binrepo.mageia.org/ +download_url = https://binrepo.mageia.org/ upload_host = binrepo.mageia.org [maintdb] host = maintdb.mageia.org -url = http://maintdb.mageia.org/ +url = https://maintdb.mageia.org/ |