patch

lbr38 · Sep 23, 2024 · 39698f1 · 39698f1
1 parent 08d5fcd
commit 39698f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build-and-test-rpm.yml b/.github/workflows/build-and-test-rpm.yml
@@ -184,13 +184,13 @@ jobs:
         run: python3 /opt/linupdate/linupdate.py --get-exclude
 
       - name: "Run test: set package exclusions on major update"
-        run: python3 /opt/linupdate/linupdate.py --exclude-major "apache2,mysql.*"
+        run: python3 /opt/linupdate/linupdate.py --exclude-major "httpd,mysql.*"
 
       - name: "Run test: get package exclusions on major update"
         run: python3 /opt/linupdate/linupdate.py --get-exclude-major
 
       - name: "Run test: set services to restart after update"
-        run: python3 /opt/linupdate/linupdate.py --service-restart "apache2,mysql"
+        run: python3 /opt/linupdate/linupdate.py --service-restart "httpd,mysql"
 
       - name: "Run test: get services to restart after update"
         run: python3 /opt/linupdate/linupdate.py --get-service-restart
@@ -199,7 +199,7 @@ jobs:
         run: python3 /opt/linupdate/linupdate.py --check-updates
 
       - name: "Run text: update specific packages"
-        run: python3 /opt/linupdate/linupdate.py --update curl,wget,apache2 --assume-yes
+        run: python3 /opt/linupdate/linupdate.py --update curl,wget,httpd --assume-yes
 
       - name: "Run test: list available modules"
         run: python3 /opt/linupdate/linupdate.py --mod-list
@@ -282,13 +282,13 @@ jobs:
         run: python3 /opt/linupdate/linupdate.py --get-exclude
 
       - name: "Run test: set package exclusions on major update"
-        run: python3 /opt/linupdate/linupdate.py --exclude-major "apache2,mysql.*"
+        run: python3 /opt/linupdate/linupdate.py --exclude-major "httpd,mysql.*"
 
       - name: "Run test: get package exclusions on major update"
         run: python3 /opt/linupdate/linupdate.py --get-exclude-major
 
       - name: "Run test: set services to restart after update"
-        run: python3 /opt/linupdate/linupdate.py --service-restart "apache2,mysql"
+        run: python3 /opt/linupdate/linupdate.py --service-restart "httpd,mysql"
 
       - name: "Run test: get services to restart after update"
         run: python3 /opt/linupdate/linupdate.py --get-service-restart
@@ -297,7 +297,7 @@ jobs:
         run: python3 /opt/linupdate/linupdate.py --check-updates
 
       - name: "Run text: update specific packages"
-        run: python3 /opt/linupdate/linupdate.py --update curl,wget,apache2 --assume-yes
+        run: python3 /opt/linupdate/linupdate.py --update curl,wget,httpd --assume-yes
 
       - name: "Run test: list available modules"
         run: python3 /opt/linupdate/linupdate.py --mod-list

diff --git a/src/controllers/Package/Dnf.py b/src/controllers/Package/Dnf.py
@@ -341,7 +341,7 @@ def update(self, packagesList, update_method: str = 'one_by_one', exit_on_packag
                     continue
 
                 # Define the command to update the package
-                cmd = ['dnf', 'update', pkg['name'], '-y']
+                cmd = ['dnf', 'update', pkg['name'] + '-' + pkg['available_version'], '-y']
 
                 popen = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, bufsize=1, universal_newlines=True)