Merge branch 'master' of github.com:tuna/tunasync-scripts

This commit is contained in:
z4yx 2020-04-05 13:18:53 +08:00
commit 2e5b023597
3 changed files with 7 additions and 6 deletions

View File

@ -12,7 +12,7 @@ COPY composer-mirror.config.php /usr/local/composer-mirror/config.php
RUN mkdir -p /home/tunasync-scripts
ADD https://storage.googleapis.com/git-repo-downloads/repo /usr/local/bin/aosp-repo
RUN chmod a+x /usr/local/bin/aosp-repo
RUN chmod 0755 /usr/local/bin/aosp-repo
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && apt-get install -y locales -qq && locale-gen
ENV LANG=en_US.UTF-8

View File

@ -54,6 +54,7 @@ CONDA_CLOUD_REPOS = (
"pyviz/linux-64", "pyviz/linux-32", "pyviz/win-64", "pyviz/win-32", "pyviz/osx-64", "pyviz/noarch",
"dglteam/linux-64", "dglteam/win-64", "dglteam/osx-64", "dglteam/noarch",
"rdkit/linux-64", "rdkit/win-64", "rdkit/osx-64", "rdkit/noarch",
"mordred-descriptor/linux-64", "mordred-descriptor/win-64", "mordred-descriptor/win-32", "mordred-descriptor/osx-64", "mordred-descriptor/noarch",
)
EXCLUDED_PACKAGES = (

View File

@ -309,12 +309,12 @@ def update_channels(channels):
channel_failure = True
logging.info(f' - Error status: {process.returncode}')
break
else:
infos = json.loads(process.stdout)
for info in infos:
ha = hash_part(info['path'])
todo[ha] = (info['url'], f'{ha}.narinfo')
else:
infos = json.loads(process.stdout)
for info in infos:
ha = hash_part(info['path'])
todo[ha] = (info['url'], f'{ha}.narinfo')
logging.info(f' - {len(todo)} paths to download')
digits = len(str(len(todo)))