Merge pull request #120 from kloptops/main

Fixed a muOS bug and a weird harbourmaster bug.
PortsMaster · Apr 8, 2024 · a43f4e5 · a43f4e5
2 parents 5df0c82 + 8312bd7
commit a43f4e5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/PortMaster/muos/control.txt b/PortMaster/muos/control.txt
@@ -24,18 +24,18 @@ get_controls() {
 }
 
 # CRUSH KILL DESTROY
-# if [ -f "$controlfolder/gptokeyb.armhf" ]; then
-#   mv "$controlfolder/gptokeyb.armhf" "$controlfolder/gptokeyb"
-# fi
+if [ -f "$controlfolder/gptokeyb.armhf" ]; then
+  mv "$controlfolder/gptokeyb.armhf" "$controlfolder/gptokeyb"
+fi
 
-# if [ -f "$controlfolder/gptokeyb2.armhf" ]; then
-#   mv "$controlfolder/gptokeyb2.armhf" "$controlfolder/gptokeyb2"
-# fi
+if [ -f "$controlfolder/gptokeyb2.armhf" ]; then
+  mv "$controlfolder/gptokeyb2.armhf" "$controlfolder/gptokeyb2"
+fi
 
-# CRUSH KILL DESTROY
-# if [ -f "$controlfolder/xdelta3.armhf" ]; then
-#   mv "$controlfolder/xdelta3.armhf" "$controlfolder/xdelta3"
-# fi
+CRUSH KILL DESTROY
+if [ -f "$controlfolder/xdelta3.armhf" ]; then
+  mv "$controlfolder/xdelta3.armhf" "$controlfolder/xdelta3"
+fi
 
 if [ -f "$controlfolder/cwtbe_flag" ]; then
   GPTOKEYB="$ESUDO $controlfolder/gptokeyb2 $ESUDOKILL"

diff --git a/PortMaster/pylibs/harbourmaster/harbour.py b/PortMaster/pylibs/harbourmaster/harbour.py
@@ -949,7 +949,7 @@ def match_requirements(self, port_info):
         show = False
         capabilities = self.device['capabilities']
 
-        requirements = port_info.get('attr', {}).get('reqs', [])
+        requirements = port_info.get('attr', {}).get('reqs', [])[:]
 
         runtime = port_info.get('attr', {}).get('runtime', None)