Address reviews

src/middlewared/middlewared/plugins/catalog/app_version.py

@@ -1,5 +1,6 @@
 import errno
 import os
+import stat
 
 from catalog_reader.train_utils import get_train_path
 
@@ -51,10 +52,11 @@ def get_app_details(self, app_name, options):
         """
         catalog = self.middleware.call_sync('catalog.config')
         app_location = os.path.join(get_train_path(catalog['location']), options['train'], app_name)
-        if not os.path.exists(app_location):
+        try:
+            if not stat.S_ISDIR(os.stat(app_location).st_mode):
+                raise CallError(f'{app_location!r} must be a directory')
+        except FileNotFoundError:
             raise CallError(f'Unable to locate {app_name!r} at {app_location!r}', errno=errno.ENOENT)
-        elif not os.path.isdir(app_location):
-            raise CallError(f'{app_location!r} must be a directory')
 
         train_data = self.middleware.call_sync('catalog.apps', {
             'retrieve_all_trains': False,

src/middlewared/middlewared/plugins/catalog/apps.py

@@ -55,7 +55,7 @@ def available(self, filters, options):
         Retrieve all available applications from all configured catalogs.
         """
         if not self.middleware.call_sync('catalog.synced'):
-            self.middleware.call_sync('catalog.initiate_first_time_sync')
+            self.middleware.call_sync('catalog.sync').wait_sync()
 
         results = []
         installed_apps = [

src/middlewared/middlewared/plugins/catalog/sync.py

@@ -58,8 +58,3 @@ def update_git_repository(self, catalog):
         return pull_clone_repository(
             catalog['repository'], os.path.dirname(catalog['location']), catalog['branch'],
         )
-
-    @private
-    async def initiate_first_time_sync(self):
-        await (await self.middleware.call('catalog.sync')).wait()
-        self.SYNCED = True

src/middlewared/middlewared/plugins/docker/update.py

@@ -52,7 +52,7 @@ async def do_update(self, job, data):
         config = old_config.copy()
         config.update(data)
 
-        if len(set(old_config.items()) ^ set(config.items())) > 0:
+        if old_config != config:
             await self.middleware.call('datastore.update', self._config.datastore, old_config['id'], config)
 
             await self.middleware.call('docker.setup.status_change')