Karl MacMillan wrote:

> > This largish patch makes the build and installation work on 64bit
> > machines. The only catch here is that to get a 64bit build you need to
> > set LIBDIR on make:
> >
> > make install LIBDIR=/usr/lib64
> >
> > The spec file does this correctly. I couldn't find any reliable way to
> > guess this that works both on real systems and in the almost entirely
> > empty rpm build root (you can't, for example, check for the existence
> > of /usr/lib64).
This commit is contained in:
Karl MacMillan
-
parent aaa992b744
commit d2a19b2009
16 changed files with 72 additions and 87 deletions

View File

@@ -128,10 +128,15 @@ def check_existing_installation():
yesno = raw_input("Do you wish to remove it and create a new one? [no]: ")
if not yesno or yesno.lower()[0] != "y":
sys.exit(1)
try:
run(["/sbin/service", "dirsrv", "stop"])
except:
pass
for d in dirs:
serverid = os.path.basename(d).split("slapd-", 1)[1]
if serverid:
erase_ds_instance_data (serverid)
erase_ds_instance_data(serverid)
def get_fqdn():
fqdn = ""
@@ -531,4 +536,7 @@ def main():
return 0
main()
try:
main()
except Exception, e:
print "Unexpected error - see ipaserver-install.log for details:\n %s" % str(e)