This commit is contained in:
Marc Beninca 2021-10-10 03:57:52 +02:00 committed by Marc Beninca
parent a0b1a1ea94
commit 74e9b15378
3 changed files with 3 additions and 3 deletions

View file

@ -2,7 +2,6 @@ import argparse
import os import os
import msys import msys
import remote
ACTION = 'action' ACTION = 'action'
ARCHITECTURES = 'architectures' ARCHITECTURES = 'architectures'

View file

@ -1,5 +1,6 @@
ARCHIVE = '.tar.xz' ARCHIVE = '.tar.xz'
ARCHITECTURES = ['x86_64', 'i686'] ARCHITECTURES = ['x86_64', 'i686']
CATALOG = '.files'
CHARSET = 'u8' CHARSET = 'u8'
SIGNATURE = '.sig' SIGNATURE = '.sig'
SUBSYSTEMS = ['msys', 'clang', 'mingw', 'ucrt'] SUBSYSTEMS = ['msys', 'clang', 'mingw', 'ucrt']

View file

@ -15,7 +15,6 @@ ARCHITECTURES_SUBSYSTEMS = {
'x86_64': ['msys', 'clang64', 'mingw64', 'ucrt64'], 'x86_64': ['msys', 'clang64', 'mingw64', 'ucrt64'],
'i686': ['msys', 'clang32', 'mingw32'], 'i686': ['msys', 'clang32', 'mingw32'],
} }
CATALOG = '.files'
DISTRIBUTION = 'distrib' DISTRIBUTION = 'distrib'
MINGW = 'mingw' MINGW = 'mingw'
@ -44,7 +43,8 @@ class Remote:
subsystem = f'{ss}{ARCHITECTURES_BITS[architecture]}' subsystem = f'{ss}{ARCHITECTURES_BITS[architecture]}'
location = os.path.join(location, MINGW, subsystem) location = os.path.join(location, MINGW, subsystem)
if subsystem in ARCHITECTURES_SUBSYSTEMS[architecture]: if subsystem in ARCHITECTURES_SUBSYSTEMS[architecture]:
location = os.path.join(location, f'{subsystem}{CATALOG}') location = os.path.join(location,
f'{subsystem}{msys.CATALOG}')
binary = requests.get(location).content binary = requests.get(location).content
c[architecture][subsystem] = catalog.Catalog(binary) c[architecture][subsystem] = catalog.Catalog(binary)
self.archives = a self.archives = a