From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Meneghel Rodrigues Subject: [PATCH 5/8] KVM test: installer: fix the 'layout 1' detection Date: Wed, 29 Dec 2010 20:37:27 -0200 Message-ID: <1293662250-18292-6-git-send-email-lmr@redhat.com> References: <1293662250-18292-1-git-send-email-lmr@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Eduardo Habkost , kvm@vger.kernel.org To: autotest@test.kernel.org Return-path: In-Reply-To: <1293662250-18292-1-git-send-email-lmr@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: autotest-bounces@test.kernel.org Errors-To: autotest-bounces@test.kernel.org List-Id: kvm.vger.kernel.org From: Eduardo Habkost The common (or only) case where we have a 'qemu' directory (old KVM versions) also contains a 'kvm' directory, so the detection of the 'old layout' code was not working. Fix this by removing the 'and not has_kvm_dir' condition. Signed-off-by: Eduardo Habkost --- client/tests/kvm/kvm_utils.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/client/tests/kvm/kvm_utils.py b/client/tests/kvm/kvm_utils.py index 1967ddd..d135979 100644 --- a/client/tests/kvm/kvm_utils.py +++ b/client/tests/kvm/kvm_utils.py @@ -445,7 +445,7 @@ def check_kvm_source_dir(source_dir): os.chdir(source_dir) has_qemu_dir = os.path.isdir('qemu') has_kvm_dir = os.path.isdir('kvm') - if has_qemu_dir and not has_kvm_dir: + if has_qemu_dir: logging.debug("qemu directory detected, source dir layout 1") return 1 if has_kvm_dir and not has_qemu_dir: -- 1.7.2.3