From 20598b34e74dc90f6a901ee9e8ce6870dea092b4 Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Sun, 29 Mar 2020 09:27:16 +0800 Subject: [PATCH 1/3] add mordred-descriptor tuna/issues#768 --- anaconda.py | 1 + 1 file changed, 1 insertion(+) diff --git a/anaconda.py b/anaconda.py index 607fa9a..3f6cc40 100755 --- a/anaconda.py +++ b/anaconda.py @@ -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 = ( From a920654c8bf2f08d0f91a006ca3e37f7ff0ec325 Mon Sep 17 00:00:00 2001 From: Miao Wang Date: Sun, 29 Mar 2020 17:17:22 +0800 Subject: [PATCH 2/3] Correct permission of aosp-repo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e371ed0..b4cf96d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 From 86950766c90ba4ec6976456c87d5a1eac157f487 Mon Sep 17 00:00:00 2001 From: dramforever Date: Tue, 31 Mar 2020 03:12:12 +0800 Subject: [PATCH 3/3] nix-channel: fix bug when getting path-info --- nix-channels.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nix-channels.py b/nix-channels.py index 50257c2..b453319 100755 --- a/nix-channels.py +++ b/nix-channels.py @@ -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)))