From 407906be64a043824b8625a672e46c4ee9e81327 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat, 5 Nov 2022 16:23:24 +0000
Subject: Ignore x86/

Stop looking in x86/
Stop generating setup.ini in x86/
Stop generating webpage for x86/
---
 calm/calm.py                                      |  2 +-
 calm/common_constants.py                          |  2 +-
 test/testdata/htdocs.expected/dirtree.expected    |  1 -
 test/testdata/process_arch/htdocs.expected        | 19 -------------------
 test/testdata/process_arch/packages.json.expected |  6 ------
 5 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/calm/calm.py b/calm/calm.py
index 196d29b..173fe47 100755
--- a/calm/calm.py
+++ b/calm/calm.py
@@ -169,7 +169,7 @@ def process_maintainer_uploads(args, state, all_packages, m, basedir, desc):
     # for each arch and noarch
     scan_result = {}
     skip_maintainer = False
-    for arch in common_constants.ARCHES + ['noarch', 'src']:
+    for arch in common_constants.ARCHES + ['noarch', 'src'] + common_constants.ARCHIVED_ARCHES:
         logging.debug("reading uploaded arch %s packages from maintainer %s" % (arch, name))
 
         # read uploads
diff --git a/calm/common_constants.py b/calm/common_constants.py
index 69d7baf..a000588 100644
--- a/calm/common_constants.py
+++ b/calm/common_constants.py
@@ -58,7 +58,7 @@ ORPHANMAINT = '/'.join([
 ])
 
 # architectures we support
-ARCHES = ['x86', 'x86_64']
+ARCHES = ['x86_64']
 
 # architectures we no longer support
 ARCHIVED_ARCHES = ['x86']
diff --git a/test/testdata/htdocs.expected/dirtree.expected b/test/testdata/htdocs.expected/dirtree.expected
index 2a30db0..ec63f08 100644
--- a/test/testdata/htdocs.expected/dirtree.expected
+++ b/test/testdata/htdocs.expected/dirtree.expected
@@ -38,7 +38,6 @@
              'test-e.html',
              'testpackage-src.html',
              'testpackage.html'],
- 'x86': ['.htaccess'],
  'x86_64': ['.htaccess'],
  'x86_64/arc': ['.htaccess', 'arc-4.32.7-10'],
  'x86_64/arc-src': ['.htaccess', 'arc-4.32.7-10-src'],
diff --git a/test/testdata/process_arch/htdocs.expected b/test/testdata/process_arch/htdocs.expected
index 9294970..46462d6 100644
--- a/test/testdata/process_arch/htdocs.expected
+++ b/test/testdata/process_arch/htdocs.expected
@@ -39,25 +39,6 @@
              'testpackage-src.html',
              'testpackage-subpackage.html',
              'testpackage.html'],
- 'x86': ['.htaccess'],
- 'x86/obs-a': ['.htaccess', 'obs-a-1.0-1'],
- 'x86/obs-a-src': ['.htaccess', 'obs-a-1.0-1-src'],
- 'x86/obs-b': ['.htaccess', 'obs-b-1.0-1'],
- 'x86/obs-b-src': ['.htaccess', 'obs-b-1.0-1-src'],
- 'x86/perl-Net-SMTP-SSL': ['.htaccess',
-                           'perl-Net-SMTP-SSL-1.02-1',
-                           'perl-Net-SMTP-SSL-1.03-1',
-                           'perl-Net-SMTP-SSL-1.03-2'],
- 'x86/perl-Net-SMTP-SSL-src': ['.htaccess',
-                               'perl-Net-SMTP-SSL-1.02-1-src',
-                               'perl-Net-SMTP-SSL-1.03-1-src',
-                               'perl-Net-SMTP-SSL-1.03-2-src'],
- 'x86/test-c': ['.htaccess', 'test-c-1.0-1'],
- 'x86/test-c-src': ['.htaccess', 'test-c-1.0-1-src'],
- 'x86/test-d': ['.htaccess', 'test-d-1.0-1'],
- 'x86/test-d-src': ['.htaccess', 'test-d-1.0-1-src'],
- 'x86/test-e': ['.htaccess', 'test-e-1.0-1'],
- 'x86/test-e-src': ['.htaccess', 'test-e-1.0-1-src'],
  'x86_64': ['.htaccess'],
  'x86_64/arc': ['.htaccess', 'arc-4.32.7-10'],
  'x86_64/arc-src': ['.htaccess', 'arc-4.32.7-10-src'],
diff --git a/test/testdata/process_arch/packages.json.expected b/test/testdata/process_arch/packages.json.expected
index b52f130..0a2a7df 100644
--- a/test/testdata/process_arch/packages.json.expected
+++ b/test/testdata/process_arch/packages.json.expected
@@ -149,7 +149,6 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86",\n'
  '                "x86_64"\n'
  '            ],\n'
  '            "name": "obs-a",\n'
@@ -170,7 +169,6 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86",\n'
  '                "x86_64"\n'
  '            ],\n'
  '            "name": "obs-b",\n'
@@ -264,7 +262,6 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86",\n'
  '                "x86_64"\n'
  '            ],\n'
  '            "homepage": "https://metacpan.org/release/RJBS/Net-SMTP-SSL-1.04",\n'
@@ -341,7 +338,6 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86",\n'
  '                "x86_64"\n'
  '            ],\n'
  '            "name": "test-c",\n'
@@ -362,7 +358,6 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86",\n'
  '                "x86_64"\n'
  '            ],\n'
  '            "name": "test-d",\n'
@@ -383,7 +378,6 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86",\n'
  '                "x86_64"\n'
  '            ],\n'
  '            "name": "test-e",\n'
-- 
cgit v1.2.3