Skip to content

Commit 4c74fc5

Browse files
authored
Merge pull request #106 from archlinux/cleanups
Cleanups
2 parents 46aa83d + fb3c31a commit 4c74fc5

3 files changed

Lines changed: 5 additions & 10 deletions

File tree

package/cleanup-list

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def parse_repo(dbpath: str) -> PKGS:
100100

101101
def get_orphans() -> set[str]:
102102
base_url = "https://archlinux.org/packages/search/json/?maintainer=orphan"
103-
query = "repo=Community&repo=Core&repo=Extra&repo=Multilib"
103+
query = "repo=Core&repo=Extra&repo=Multilib"
104104
response = requests.get(f"{base_url}&{query}").json()
105105
num_pages = response["num_pages"]
106106

@@ -114,10 +114,10 @@ def get_orphans() -> set[str]:
114114
return {pkg["pkgname"] for pkg in results}
115115

116116

117-
def get_packages(mirror="http://mirror.pkgbuild.com") -> PKGS:
117+
def get_packages(mirror="https://mirror.pkgbuild.com") -> PKGS:
118118
pkgs = {}
119119
with tempfile.TemporaryDirectory() as tmpdir:
120-
for repo in ("core", "extra", "community", "multilib"):
120+
for repo in ("core", "extra", "multilib"):
121121
url = f"{mirror}/{repo}/os/x86_64/{repo}.db"
122122
response = requests.get(url)
123123

package/staging2testing

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ CMD = './db-move {} {} {}'
1212

1313
def main(url):
1414
pkgs = set()
15-
communitypkgs = set()
1615
multilibpkgs = set()
1716

1817
try:
@@ -24,17 +23,13 @@ def main(url):
2423
for pkg in r.json()['packages']:
2524
pkgbase = pkg['pkgbase']
2625

27-
if pkg['repo'] == 'community':
28-
communitypkgs.add(pkgbase)
29-
elif pkg['repo'] == 'multilib':
26+
if pkg['repo'] == 'multilib':
3027
multilibpkgs.add(pkgbase)
3128
else:
3229
pkgs.add(pkgbase)
3330

3431
if pkgs:
3532
print(CMD.format('staging', 'testing', ' '.join(pkgs)))
36-
if communitypkgs:
37-
print(CMD.format('community-staging', 'community-testing', ' '.join(communitypkgs)))
3833
if multilibpkgs:
3934
print(CMD.format('multilib-staging', 'multilib-testing', ' '.join(multilibpkgs)))
4035

security/repo-sec-checker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ from tabulate import tabulate
2424
ARCHS = ['x86_64']
2525
PKG_EXT = '.tar.zst'
2626
DEFAULT_SOURCE_DIR = '/srv/ftp'
27-
SOURCE_WHITELIST = ['core', 'extra', 'community', 'multilib']
27+
SOURCE_WHITELIST = ['core', 'extra', 'multilib']
2828

2929
# FORTIFY_SOURCE checklist
3030
UNSAFE_FUNCTIONS = set([

0 commit comments

Comments
 (0)