diff --git a/bin/bastion.py b/bin/bastion.py index 52e3fc3..097569e 100755 --- a/bin/bastion.py +++ b/bin/bastion.py @@ -450,15 +450,14 @@ def do_amend_asset(self, request): site = self.site(ark) asset = site.asset(ark) vault = self.vault(asset.policy.vault) - result = vault.amend(asset) + action = vault.amend(asset) request['log.scope'] = "site/{}".format(ark.site) - if result.indicates_success: - blonde = result.body['blonde'] - return request.succeeded(result, report = "amended asset {} to {}".format(str(ark), str(blonde))) + if action.succeeded: + return request.succeeded(action, report = "amended asset {} to {}".format(str(ark), str(action.blonde))) else: - return request.failed(result, report = "amend operation on asset {} failed".format(str(ark))) + return request.failed(action, report = "amend operation on asset {} failed".format(str(ark))) def do_amend_site(self, request): """ diff --git a/lib/Bastion/Clerks/SFTP.py b/lib/Bastion/Clerks/SFTP.py index b24fbd9..d2b05fd 100644 --- a/lib/Bastion/Clerks/SFTP.py +++ b/lib/Bastion/Clerks/SFTP.py @@ -50,7 +50,7 @@ def assets(self, site, zone): assets = [ ] zroot = self.scurler / site / zone if zroot.exists( ): - for alien in zroot.is_dir(): + for alien in zroot: assets.append(alien.name) return tuple(sorted(assets)) @@ -80,7 +80,7 @@ def manifest(self, *args): if cell.exists: for alien in cell.lsall(): print("ALIEN: ", alien) - if not alien.is_dir(): + if not alien.is_folder: blondes.append( BLONDE.decode(alien.stem) ) manifest = Manifest(ark, blondes) diff --git a/lib/Bastion/NetOps/sCURL.py b/lib/Bastion/NetOps/sCURL.py index 8877a59..f8e905e 100644 --- a/lib/Bastion/NetOps/sCURL.py +++ b/lib/Bastion/NetOps/sCURL.py @@ -326,6 +326,8 @@ def __init__(self, *args, **kwargs): #-- Construct the base command given my default configuration. | #-- All SFTP operations will be built by augmenting the base command ... | #-- ... with additional flags and arguments. | + #-- As of 2025-04-01 the "--key" flag does nothing, libssh always ... | + #-- assumes the default key, or must use the ssh-keyagent | #------------------------------------------------------------------------- basecom = [str(self.CURL)] #if self.keypath is not None: