summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--amar.py19
3 files changed, 10 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bbc9205358db..cd3d521f8a2e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = amar-installer
pkgdesc = Install AMAR repository
- pkgver = 1.9.11.fb
+ pkgver = 1.9.12.fb
pkgrel = 1
url = https://www.tuxnvape.fr/
install = amar.install
@@ -15,7 +15,7 @@ pkgbase = amar-installer
source = amar.glade
source = amarban.png
source = org.tnv.amar.policy
- sha256sums = 7183315ded7ab7af4923ac42e8777268692d308590bd18a73bf72ee98989fc0b
+ sha256sums = fe40dcd2375a8dafba8c37a28afbd74a71f440f0370809f9c881f576627a11f5
sha256sums = 874700067f446dff59f8e4e6c3b14519ca8afdf31742af629343c80002c71376
sha256sums = c5dbfca766050bdbfd36866c1f479ca8039aae80fa8b2847b376c05087d1364c
sha256sums = d8fafeb25a8b2368803565ed62ba147aa38adfe57089fe44125f5e07eea3d21b
diff --git a/PKGBUILD b/PKGBUILD
index 9db75f26a6fd..cfb76f2201e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Elrondo46 TuxnVape <elrond94@hotmail.com>
pkgname=amar-installer
-pkgver=1.9.11.fb
+pkgver=1.9.12.fb
pkgrel=1
pkgdesc="Install AMAR repository"
arch=('x86_64')
@@ -17,7 +17,7 @@ source=("amar.py"
"amarban.png"
"org.tnv.amar.policy")
-sha256sums=('7183315ded7ab7af4923ac42e8777268692d308590bd18a73bf72ee98989fc0b'
+sha256sums=('fe40dcd2375a8dafba8c37a28afbd74a71f440f0370809f9c881f576627a11f5'
'874700067f446dff59f8e4e6c3b14519ca8afdf31742af629343c80002c71376'
'c5dbfca766050bdbfd36866c1f479ca8039aae80fa8b2847b376c05087d1364c'
'd8fafeb25a8b2368803565ed62ba147aa38adfe57089fe44125f5e07eea3d21b'
diff --git a/amar.py b/amar.py
index d4ef9ff0bf9d..a0d351b98829 100644
--- a/amar.py
+++ b/amar.py
@@ -50,20 +50,13 @@ try:
except OSError:
errorButtons()
-if etatamar == 1:
- buttonactive.set_label('DESACTIVER')
-else:
- buttonactive.set_label('ACTIVER')
+buttonactive.set_label('DESACTIVER' if etatamar == 1 else 'ACTIVER')
configamar = "\n#Do not disable AMAR manually if you use the app\nInclude = /etc/pacman.d/amar.conf\n"
-def success1():
+def success():
buttonactive.set_sensitive(True)
- buttonactive.set_label('DESACTIVER')
-
-def success2():
- buttonactive.set_sensitive(True)
- buttonactive.set_label('ACTIVER')
+ buttonactive.set_label('DESACTIVER' if etatamar == 1 else 'ACTIVER')
def pressActive():
global etatamar
@@ -75,7 +68,7 @@ def pressActive():
os.system("pacman -Syy")
etatamar = 1
ecrire.close()
- GLib.idle_add(success1)
+ GLib.idle_add(success)
except OSError:
GLib.idle_add(errorButtons)
else:
@@ -91,10 +84,10 @@ def pressActive():
etatamar = 0
f.close()
new_f.close()
- GLib.idle_add(success2)
+ GLib.idle_add(success)
except OSError:
GLib.idle_add(errorButtons)
window = builder.get_object("mainWindow")
window.show_all()
-Gtk.main()
+Gtk.main() \ No newline at end of file