Revision 371ab004

b/snf-cyclades-app/synnefo/logic/servers.py
542 542

  
543 543
    """
544 544

  
545
    if port.machine is not None:
545
    vm = port.machine
546
    if vm is not None and not vm.deleted:
546 547
        vm = disconnect(port.machine, port)
547 548
        log.info("Removing port %s, Job: %s", port, vm.task_job_id)
548 549
    else:
b/snf-cyclades-app/synnefo/management/common.py
250 250

  
251 251
def wait_server_task(server, wait, stdout):
252 252
    jobID = server.task_job_id
253
    if jobID is None:
254
        return
253 255
    if wait:
254 256
        msg = "Issued job '%s'. Waiting to complete...\n"
255 257
        stdout.write(msg % jobID)

Also available in: Unified diff