From 74e9b15378b850e054f5d0b852b9940896dd1940 Mon Sep 17 00:00:00 2001
From: Marc Beninca <marc@rwx.work>
Date: Sun, 10 Oct 2021 03:57:52 +0200
Subject: [PATCH] catalog

---
 arguments.py | 1 -
 msys.py      | 1 +
 remote.py    | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arguments.py b/arguments.py
index 1d65880..462a1a9 100644
--- a/arguments.py
+++ b/arguments.py
@@ -2,7 +2,6 @@ import argparse
 import os
 
 import msys
-import remote
 
 ACTION = 'action'
 ARCHITECTURES = 'architectures'
diff --git a/msys.py b/msys.py
index 905c5ef..ca6533a 100644
--- a/msys.py
+++ b/msys.py
@@ -1,5 +1,6 @@
 ARCHIVE = '.tar.xz'
 ARCHITECTURES = ['x86_64', 'i686']
+CATALOG = '.files'
 CHARSET = 'u8'
 SIGNATURE = '.sig'
 SUBSYSTEMS = ['msys', 'clang', 'mingw', 'ucrt']
diff --git a/remote.py b/remote.py
index 3e09ad1..b5b3370 100644
--- a/remote.py
+++ b/remote.py
@@ -15,7 +15,6 @@ ARCHITECTURES_SUBSYSTEMS = {
     'x86_64': ['msys', 'clang64', 'mingw64', 'ucrt64'],
     'i686': ['msys', 'clang32', 'mingw32'],
 }
-CATALOG = '.files'
 DISTRIBUTION = 'distrib'
 MINGW = 'mingw'
 
@@ -44,7 +43,8 @@ class Remote:
                     subsystem = f'{ss}{ARCHITECTURES_BITS[architecture]}'
                     location = os.path.join(location, MINGW, subsystem)
                 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
                     c[architecture][subsystem] = catalog.Catalog(binary)
         self.archives = a