patch

lbr38 · Jul 16, 2024 · 4c849e3 · 4c849e3
1 parent 69af09f
commit 4c849e3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/build-deb.yml b/.github/workflows/build-deb.yml
@@ -94,9 +94,6 @@ jobs:
           apt-get update -y
           apt-get install -y ./linupdate-test-build_${{ env.VERSION }}_all.deb
 
-      - name: debug
-        run: ls -l /opt/linupdate/linupdate.py
-
       - name: Launch linupdate
         run: python3 /opt/linupdate/linupdate.py --check-updates
 
@@ -127,6 +124,9 @@ jobs:
           apt-get update -y
           apt-get install -y ./linupdate-test-build_${{ env.VERSION }}_all.deb
 
+      - name: Launch linupdate
+        run: python3 /opt/linupdate/linupdate.py --check-updates
+
   # Try to install package on Ubuntu (latest)
   install-ubuntu:
     name: Install on Ubuntu (latest)
@@ -150,3 +150,6 @@ jobs:
         run: |
           sudo apt-get update -y
           sudo apt-get install -y ./linupdate-test-build_${{ env.VERSION }}_all.deb
+
+      - name: Launch linupdate
+        run: python3 /opt/linupdate/linupdate.py --check-updates
diff --git a/dependencies.txt b/dependencies.txt
@@ -9,6 +9,7 @@ python3-yaml
 python3-dateutil
 python3-simplejson
 python3-distro
+python3-apt
 
 
 # rpm :
@@ -20,7 +21,7 @@ python3-yaml
 python3-dateutil
 python3-simplejson
 python3-distro
-
+python3-yum
 
 
 

diff --git a/src/controllers/Exit.py b/src/controllers/Exit.py
@@ -21,6 +21,7 @@ def cleanExit(self, exit_code = 0, send_mail: bool = True, logfile: str = None):
 
         # Try to get mail settings
         # It could fail if the config file is not found or if the mail section is not defined (e.g. first execution)
+        # So if it fails to retrieve configuration, just don't send the mail
         try:
             mail_enabled = my_config.getMailEnabled()
             mail_recipient = my_config.getMailRecipient()

diff --git a/src/controllers/System.py b/src/controllers/System.py
@@ -39,7 +39,7 @@ def check(self):
     #
     #-------------------------------------------------------------------------------------------------------------------
     def getOsFamily(self):
-        if (distro.name() in ['Debian', 'Ubuntu', 'Kubuntu', 'Xubuntu', 'Linux Mint']):
+        if (distro.name() in ['Debian GNU/Linux', 'Debian', 'Ubuntu', 'Kubuntu', 'Xubuntu', 'Linux Mint']):
             return 'Debian'
 
         if (distro.name() in ['Red Hat Enterprise Linux', 'Centos', 'CentOS Stream', 'Fedora', 'Alma Linux', 'Rocky Linux', 'Oracle Linux Server']):