Skip to content

Commit 7a459ef

Browse files
jellyanthraxx
authored andcommitted
Update repositories for the Git migration
The [community] repository is merged into the [extra] repository during the Git migration. [testing] is replaced with [core-testing] and [extra-testing].
1 parent 972cdd7 commit 7a459ef

File tree

4 files changed

+12
-15
lines changed

4 files changed

+12
-15
lines changed

pacman/arch/x86_64/pacman.conf

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,16 @@ LocalFileSigLevel = Optional
6969
# repo name header and Include lines. You can add preferred servers immediately
7070
# after the header, and they will be used before the default mirrors.
7171

72-
[testing]
72+
[core-testing]
7373
Include = /etc/pacman.d/mirrorlist
7474

7575
[core]
7676
Include = /etc/pacman.d/mirrorlist
7777

78-
[extra]
79-
Include = /etc/pacman.d/mirrorlist
80-
81-
[community-testing]
78+
[extra-testing]
8279
Include = /etc/pacman.d/mirrorlist
8380

84-
[community]
81+
[extra]
8582
Include = /etc/pacman.d/mirrorlist
8683

8784
# If you want to run 32 bit applications on your x86_64 system,

test/test_group.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ def test_edit_group_bug_url_core(db, client):
116116
set_and_assert_group_data(db, client, url_for('tracker.add_group'), bug_ticket='')
117117

118118

119-
@create_package(name='foo', version='1.2.3-4', database='community')
119+
@create_package(name='foo', version='1.2.3-4', database='extra')
120120
@logged_in
121-
def test_edit_group_bug_url_community(db, client):
122-
set_and_assert_group_data(db, client, url_for('tracker.add_group'), bug_ticket='', database='community')
121+
def test_edit_group_bug_url_extra(db, client):
122+
set_and_assert_group_data(db, client, url_for('tracker.add_group'), bug_ticket='', database='extra')
123123

124124

125125
def test_add_needs_login(db, client):
@@ -392,10 +392,10 @@ def test_affected_to_status_testing_only(db, client):
392392
status = affected_to_status(Affected.affected, 'foo', avg.fixed)
393393
assert status == Status.testing
394394

395-
@create_package(name='foo', version='1.2.3-3', database='community')
396-
@create_package(name='foo', version='1.2.3-4', database='community-testing')
395+
@create_package(name='foo', version='1.2.3-3', database='extra')
396+
@create_package(name='foo', version='1.2.3-4', database='extra-testing')
397397
@create_group(id=DEFAULT_GROUP_ID, packages=['foo'], affected='1.2.3-3', fixed='1.2.3-4')
398-
def test_affected_to_status_community_testing(db, client):
398+
def test_affected_to_status_extra_testing(db, client):
399399
avg = CVEGroup.query.get(DEFAULT_GROUP_ID)
400400
status = affected_to_status(Affected.affected, 'foo', avg.fixed)
401401
assert status == Status.testing

tracker/pacman.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
archs = ['x86_64']
1313
primary_arch = 'x86_64'
14-
repos = {'x86_64': ['core', 'extra', 'community', 'multilib', 'testing', 'community-testing', 'multilib-testing']}
14+
repos = {'x86_64': ['core', 'core-testing', 'extra', 'extra-testing', 'multilib', 'multilib-testing']}
1515
configpath = './pacman/arch/{}/pacman.conf'
1616
handles = {}
1717
chdir(basedir)

tracker/view/show.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252

5353
def get_bug_project(databases):
5454
bug_project_mapping = {
55-
1: ['core', 'extra', 'testing'],
56-
5: ['community', 'community-testing', 'multilib', 'multilib-testing']
55+
1: ['core', 'core-testing', 'extra', 'extra-testing'],
56+
5: ['multilib', 'multilib-testing']
5757
}
5858

5959
for category, repos in bug_project_mapping.items():

0 commit comments

Comments
 (0)