1
0
mirror of https://github.com/altlinux/gpupdate.git synced 2025-08-25 05:49:25 +03:00

Merge pull request #68 from altlinux/wipe_logic_fix

Wipe logic fix
This commit is contained in:
Evgeny Sinelnikov
2020-05-21 15:54:30 +04:00
committed by GitHub
2 changed files with 9 additions and 3 deletions

View File

@ -105,7 +105,10 @@ class gpoa_controller:
if is_root(): if is_root():
back = backend_factory(dc, self.username, self.is_machine, nodomain) back = backend_factory(dc, self.username, self.is_machine, nodomain)
if back: if back:
back.retrieve_and_store() try:
back.retrieve_and_store()
except Exception as exc:
logging.error(slogm('Backend execution error: {}'.format(str(exc))))
def start_frontend(self): def start_frontend(self):
''' '''

View File

@ -66,8 +66,9 @@ class smbcreds (smbopts):
self.selected_dc = dc_fqdn self.selected_dc = dc_fqdn
else: else:
self.selected_dc = samba_dc self.selected_dc = samba_dc
except: except Exception as exc:
logging.error(slogm('Unable to determine DC hostname')) logging.error(slogm('Unable to determine DC hostname'))
raise exc
return self.selected_dc return self.selected_dc
@ -82,8 +83,9 @@ class smbcreds (smbopts):
res = netcmd_get_domain_infos_via_cldap(self.lp, None, self.selected_dc) res = netcmd_get_domain_infos_via_cldap(self.lp, None, self.selected_dc)
dns_domainname = res.dns_domain dns_domainname = res.dns_domain
logging.info(slogm('Found domain via CLDAP: {}'.format(dns_domainname))) logging.info(slogm('Found domain via CLDAP: {}'.format(dns_domainname)))
except: except Exception as exc:
logging.error(slogm('Unable to retrieve domain name via CLDAP query')) logging.error(slogm('Unable to retrieve domain name via CLDAP query'))
raise exc
return dns_domainname return dns_domainname
@ -120,6 +122,7 @@ class smbcreds (smbopts):
logging.error( logging.error(
slogm('Unable to refresh GPO list for {} from {}'.format( slogm('Unable to refresh GPO list for {} from {}'.format(
username, self.selected_dc))) username, self.selected_dc)))
raise exc
return gpos return gpos