migration

usr/share/archlinux-tweak-tool/archlinux-tweak-tool.py

@@ -663,11 +663,10 @@ def __init__(self):
 
         # ========================ARCH REPO=============================
 
-        arch_testing = pmf.check_repo("[testing]")
+        arch_testing = pmf.check_repo("[core-testing]")
         arch_core = pmf.check_repo("[core]")
         arch_extra = pmf.check_repo("[extra]")
-        arch_community_testing = pmf.check_repo("[community-testing]")
-        arch_community = pmf.check_repo("[community]")
+        arch_community = pmf.check_repo("[extra-testing]")
         arch_multilib_testing = pmf.check_repo("[multilib-testing]")
         arch_multilib = pmf.check_repo("[multilib]")
 
@@ -731,7 +730,6 @@ def __init__(self):
         self.checkbutton2.set_active(arch_testing)
         self.checkbutton6.set_active(arch_core)
         self.checkbutton7.set_active(arch_extra)
-        self.checkbutton4.set_active(arch_community_testing)
         self.checkbutton5.set_active(arch_community)
         self.checkbutton3.set_active(arch_multilib_testing)
         self.checkbutton8.set_active(arch_multilib)
@@ -2989,7 +2987,7 @@ def on_xero_nv_toggle(self, widget, active):
                 pmf.toggle_test_repos(self, widget.get_active(), "xero_nv")
 
     def on_pacman_toggle1(self, widget, active):
-        if not pmf.repo_exist("[testing]"):
+        if not pmf.repo_exist("[core-testing]"):
             pmf.append_repo(self, fn.arch_testing_repo)
             print("Repo has been added to /etc/pacman.conf")
             fn.show_in_app_notification(self, "Repo has been added to /etc/pacman.conf")
@@ -3016,17 +3014,17 @@ def on_pacman_toggle3(self, widget, active):
                 pmf.toggle_test_repos(self, widget.get_active(), "extra")
 
     def on_pacman_toggle4(self, widget, active):
-        if not pmf.repo_exist("[community-testing]"):
+        if not pmf.repo_exist("[extra-testing]"):
             pmf.append_repo(self, fn.arch_community_testing_repo)
             print("Repo has been added to /etc/pacman.conf")
             fn.show_in_app_notification(self, "Repo has been added to /etc/pacman.conf")
         else:
             if self.opened is False:
-                pmf.toggle_test_repos(self, widget.get_active(), "community-testing")
+                pmf.toggle_test_repos(self, widget.get_active(), "extra-testing")
 
     def on_pacman_toggle5(self, widget, active):
-        if not pmf.repo_exist("[community]"):
-            pmf.append_repo(self, fn.arch_community_repo)
+        if not pmf.repo_exist("[extra-testing]"):
+            pmf.append_repo(self, fn.arch_extra_testing_repo)
             print("Repo has been added to /etc/pacman.conf")
             GLib.idle_add(
                 fn.show_in_app_notification,

usr/share/archlinux-tweak-tool/data/eos/pacman/pacman.conf

@@ -19,7 +19,6 @@ HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
-#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -36,7 +35,6 @@ ILoveCandy
 #NoProgressBar
 #CheckSpace
 VerbosePkgLists
-DisableDownloadTimeout
 ParallelDownloads = 5
 
 # By default, pacman accepts packages signed by keys that its local keyring
@@ -76,19 +74,16 @@ LocalFileSigLevel = Optional
 SigLevel = PackageRequired
 Include = /etc/pacman.d/endeavouros-mirrorlist
 
-#[testing]
+#[core-testing]
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
+#[extra-testing]
 #Include = /etc/pacman.d/mirrorlist
 
-[community]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
 # If you want to run 32 bit applications on your x86_64 system,

usr/share/archlinux-tweak-tool/functions.py

@@ -181,7 +181,7 @@
 SigLevel = Optional TrustAll\n\
 Include = /etc/pacman.d/xero-mirrorlist"
 
-arch_testing_repo = "[testing]\n\
+arch_testing_repo = "[core-testing]\n\
 Include = /etc/pacman.d/mirrorlist"
 
 arch_core_repo = "[core]\n\
@@ -190,10 +190,7 @@
 arch_extra_repo = "[extra]\n\
 Include = /etc/pacman.d/mirrorlist"
 
-arch_community_testing_repo = "[community-testing]\n\
-Include = /etc/pacman.d/mirrorlist"
-
-arch_community_repo = "[community]\n\
+arch_extra_testing_repo = "[extra-testing]\n\
 Include = /etc/pacman.d/mirrorlist"
 
 arch_multilib_testing_repo = "[multilib-testing]\n\

usr/share/archlinux-tweak-tool/pacman_functions.py

@@ -191,15 +191,15 @@ def toggle_test_repos(self, state, widget):
                     pacman_on("[arcolinux_repo_xlarge]", lines, i, line)
 
                 if widget == "testing":
-                    pacman_on("[testing]", lines, i, line)
+                    pacman_on("[core-testing]", lines, i, line)
                 if widget == "core":
                     pacman_on("[core]", lines, i, line)
                 if widget == "extra":
                     pacman_on("[extra]", lines, i, line)
                 if widget == "community-testing":
-                    pacman_on("[community-testing]", lines, i, line)
+                    pacman_on("[extra-testing]", lines, i, line)
                 if widget == "community":
-                    pacman_on("[community]", lines, i, line)
+                    pacman_on("[extra-testing]", lines, i, line)
                 if widget == "multilib-testing":
                     pacman_on("[multilib-testing]", lines, i, line)
                 if widget == "multilib":
@@ -247,15 +247,15 @@ def toggle_test_repos(self, state, widget):
                     pacman_off("[arcolinux_repo_xlarge]", lines, i, line)
 
                 if widget == "testing":
-                    pacman_off("[testing]", lines, i, line)
+                    pacman_off("[core-testing]", lines, i, line)
                 if widget == "core":
                     pacman_off("[core]", lines, i, line)
                 if widget == "extra":
                     pacman_off("[extra]", lines, i, line)
                 if widget == "community-testing":
-                    pacman_off("[community-testing]", lines, i, line)
+                    pacman_off("[extra-testing]", lines, i, line)
                 if widget == "community":
-                    pacman_off("[community]", lines, i, line)
+                    pacman_off("[extra-testing]", lines, i, line)
                 if widget == "multilib-testing":
                     pacman_off("[multilib-testing]", lines, i, line)
                 if widget == "multilib":

usr/share/archlinux-tweak-tool/pacman_gui.py

@@ -108,13 +108,18 @@ def gui(self, Gtk, vboxstack1, fn):
     self.checkbutton2 = Gtk.Switch()
     self.checkbutton2.connect("notify::active", self.on_pacman_toggle1)
     label3 = Gtk.Label(xalign=0)
-    label3.set_markup("# Enable Arch Linux testing repo")
+    label3.set_markup("# Enable Arch Linux core testing repo")
 
     self.checkbutton6 = Gtk.Switch()
     self.checkbutton6.connect("notify::active", self.on_pacman_toggle2)
     label13 = Gtk.Label(xalign=0)
     label13.set_markup("Enable Arch Linux core repo")
 
+    self.checkbutton5 = Gtk.Switch()
+    self.checkbutton5.connect("notify::active", self.on_pacman_toggle5)
+    label12 = Gtk.Label(xalign=0)
+    label12.set_markup("#Enable Arch Linux extra-testing repo")
+
     self.checkbutton7 = Gtk.Switch()
     self.checkbutton7.connect("notify::active", self.on_pacman_toggle3)
     label14 = Gtk.Label(xalign=0)
@@ -123,12 +128,7 @@ def gui(self, Gtk, vboxstack1, fn):
     self.checkbutton4 = Gtk.Switch()
     self.checkbutton4.connect("notify::active", self.on_pacman_toggle4)
     label10 = Gtk.Label(xalign=0)
-    label10.set_markup("# Enable Arch Linux community testing repo")
-
-    self.checkbutton5 = Gtk.Switch()
-    self.checkbutton5.connect("notify::active", self.on_pacman_toggle5)
-    label12 = Gtk.Label(xalign=0)
-    label12.set_markup("Enable Arch Linux community repo")
+    label10.set_markup("# Enable Arch Linux core testing repo")
 
     self.checkbutton3 = Gtk.Switch()
     self.checkbutton3.connect("notify::active", self.on_pacman_toggle6)
@@ -229,6 +229,8 @@ def gui(self, Gtk, vboxstack1, fn):
     #               TESTING REPOS PACKING
     # ========================================================
 
+    hboxstack14.pack_start(label12, False, True, 10)
+    hboxstack14.pack_end(self.checkbutton5, False, False, 10)
     hboxstack5.pack_start(label3, False, True, 10)
     hboxstack5.pack_end(self.checkbutton2, False, False, 10)
     hboxstack15.pack_start(label13, False, True, 10)
@@ -237,8 +239,6 @@ def gui(self, Gtk, vboxstack1, fn):
     hboxstack16.pack_end(self.checkbutton7, False, False, 10)
     hboxstack12.pack_start(label10, False, True, 10)
     hboxstack12.pack_end(self.checkbutton4, False, False, 10)
-    hboxstack14.pack_start(label12, False, True, 10)
-    hboxstack14.pack_end(self.checkbutton5, False, False, 10)
     hboxstack6.pack_start(label4, False, True, 10)
     hboxstack6.pack_end(self.checkbutton3, False, False, 10)
     hboxstack17.pack_start(label15, False, True, 10)
@@ -314,9 +314,9 @@ def gui(self, Gtk, vboxstack1, fn):
     vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=10)
     vbox.pack_start(hboxstack5, False, False, 0)
     vbox.pack_start(hboxstack15, False, False, 0)
-    vbox.pack_start(hboxstack16, False, False, 0)
-    vbox.pack_start(hboxstack12, False, False, 0)
     vbox.pack_start(hboxstack14, False, False, 0)
+    vbox.pack_start(hboxstack16, False, False, 0)
+    # vbox.pack_start(hboxstack12, False, False, 0)
     vbox.pack_start(hboxstack6, False, False, 0)
     vbox.pack_start(hboxstack17, False, False, 0)
     frame.add(vbox)