Merge pull request #26 from kloptops/main

pugwash: fixed some bugs, updated translations, bumped version.

PortMaster/pugwash

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 ## -- BEGIN PORTMASTER INFO --
-PORTMASTER_VERSION = '8.4.23'
+PORTMASTER_VERSION = '8.4.24'
 PORTMASTER_RELEASE_CHANNEL = 'beta'
 ## -- END PORTMASTER INFO --
 
@@ -947,7 +947,7 @@ class PortMasterGUI(pySDL2gui.GUI, harbourmaster.Callback):
     def delete_port_size(self, port_name):
         # Delete info about a port
         if port_name in self.port_size_files:
-            for port_file, port_info in self.port_size_files[port_name]:
+            for port_file, port_info in self.port_size_files[port_name].items():
                 if port_name in self.port_size_file_lookup[port_file]:
                     self.port_size_file_lookup[port_file].remove(port_name)
 

PortMaster/pylibs/harbourmaster/config.py

@@ -27,7 +27,10 @@
 HM_DEFAULT_PORTS_DIR = Path("/roms/ports")
 HM_DEFAULT_TOOLS_DIR = Path("/roms/ports")
 
-if (Path().cwd() / '.git').is_dir() or (Path().cwd() / '..' / '.git').is_dir():
+if (Path().cwd() / '..' / '.git').is_dir():
+    os.chdir(Path().cwd() / '..')
+
+if (Path().cwd() / '.git').is_dir():
     ## For testing
     HM_DEFAULT_TOOLS_DIR = Path('.').absolute()
     HM_DEFAULT_PORTS_DIR = Path('ports/').absolute()

PortMaster/pylibs/harbourmaster/harbour.py

@@ -768,6 +768,10 @@ def port_info_attrs(self, port_info):
         if rtr:
             add_list_unique(attrs, 'rtr')
 
+        exp = port_info.get('attr', {}).get('exp', False)
+        if exp:
+            add_list_unique(attrs, 'exp')
+
         if port_info['name'].casefold() in self.installed_ports:
             add_list_unique(attrs, 'installed')
 

PortMaster/pylibs/harbourmaster/info.py

@@ -30,6 +30,7 @@
     'porter': [],
     'image': {},
     'rtr': False,
+    'exp': False,
     'runtime': None,
     'reqs': [],
     }

PortMaster/pylibs/harbourmaster/util.py

@@ -505,11 +505,12 @@ def timeit_wrapper(*args, **kwargs):
         total_time = end_time - start_time
         logger.debug(f'TIME: {func.__name__}({args}, {kwargs}): Took {total_time:.4f} seconds')
         return result
+
     return timeit_wrapper
 
 
 def port_sort_alphabetical(port_info):
-    port_info.get('attr', {}).get('title', port_info['name']).casefold()
+    return port_info.get('attr', {}).get('title', port_info['name']).casefold()
 
 
 def port_sort_date_added(port_info):