Revert "s4:provision Improve the handling of provision errors"

This reverts partially commit 027123199e13cc02ae4edadd8f0dd0f0660e1193.

Andrew, this is not Python 2.4+ compatible

1 files changed, 18 insertions, 25 deletions

diff --git a/source4/setup/provision b/source4/setup/provision
index 66aab7ea62..2bb6b87a03 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -37,7 +37,6 @@ from samba.auth import system_session
 import samba.getopt as options
 from samba.provision import provision, FILL_FULL, FILL_NT4SYNC, FILL_DRS, find_setup_dir
 from samba import DS_DOMAIN_FUNCTION_2003, DS_DOMAIN_FUNCTION_2008, DS_DOMAIN_FUNCTION_2008_R2
-from samba.provisionexceptions import ProvisioningError
 
 # how do we make this case insensitive??
 
@@ -226,27 +225,21 @@ elif opts.use_xattrs == "auto":
 
 
 session = system_session()
-try:
-	provision(setup_dir, message, 
-		  session, creds, smbconf=smbconf, targetdir=opts.targetdir,
-		  samdb_fill=samdb_fill, realm=opts.realm, domain=opts.domain,
-		  domainguid=opts.domain_guid, domainsid=opts.domain_sid,
-		  policyguid=opts.policy_guid, policyguid_dc=opts.policy_guid_dc,
-		  hostname=opts.host_name,
-		  hostip=opts.host_ip, hostip6=opts.host_ip6,
-		  ntdsguid=opts.ntds_guid,
-		  invocationid=opts.invocationid, adminpass=opts.adminpass,
-		  krbtgtpass=opts.krbtgtpass, machinepass=opts.machinepass,
-		  dnspass=opts.dnspass, root=opts.root, nobody=opts.nobody,
-		  wheel=opts.wheel, users=opts.users,
-		  serverrole=server_role, dom_for_fun_level=dom_for_fun_level,
-		  ldap_backend_extra_port=opts.ldap_backend_extra_port, 
-		  backend_type=opts.ldap_backend_type,
-		  ldapadminpass=opts.ldapadminpass, ol_mmr_urls=opts.ol_mmr_urls,
-		  slapd_path=opts.slapd_path, setup_ds_path=opts.setup_ds_path,
-		  nosync=opts.nosync,ldap_dryrun_mode=opts.ldap_dryrun_mode,useeadb=eadb)
-except ProvisioningError as e:
-	print str(e)
-	exit(1)
-
-	
+provision(setup_dir, message,
+          session, creds, smbconf=smbconf, targetdir=opts.targetdir,
+          samdb_fill=samdb_fill, realm=opts.realm, domain=opts.domain,
+          domainguid=opts.domain_guid, domainsid=opts.domain_sid,
+          policyguid=opts.policy_guid, policyguid_dc=opts.policy_guid_dc,
+          hostname=opts.host_name,
+          hostip=opts.host_ip, hostip6=opts.host_ip6,
+          ntdsguid=opts.ntds_guid,
+          invocationid=opts.invocationid, adminpass=opts.adminpass,
+          krbtgtpass=opts.krbtgtpass, machinepass=opts.machinepass,
+          dnspass=opts.dnspass, root=opts.root, nobody=opts.nobody,
+          wheel=opts.wheel, users=opts.users,
+          serverrole=server_role, dom_for_fun_level=dom_for_fun_level,
+          ldap_backend_extra_port=opts.ldap_backend_extra_port,
+          backend_type=opts.ldap_backend_type,
+          ldapadminpass=opts.ldapadminpass, ol_mmr_urls=opts.ol_mmr_urls,
+          slapd_path=opts.slapd_path, setup_ds_path=opts.setup_ds_path,
+          nosync=opts.nosync,ldap_dryrun_mode=opts.ldap_dryrun_mode,useeadb=eadb)