diff --git a/.gitignore b/.gitignore index 81eba9119a3..d7723b24bc6 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ dist/ *.bak cloud-*.tar.bz2 *.log +*.pyc +build.number diff --git a/client/bindir/cloud-update-xenserver-licenses.in b/client/bindir/cloud-update-xenserver-licenses.in index 6249f7805fe..94b8e3e8ceb 100755 --- a/client/bindir/cloud-update-xenserver-licenses.in +++ b/client/bindir/cloud-update-xenserver-licenses.in @@ -125,7 +125,7 @@ except IndexError: e("The first argument must be the license file to use") if options.all: if len(args) != 0: e("IP addresses cannot be specified if -a is specified") - config = cloud_utils.read_properties(cfg) + config = read_properties(cfg) creds = getknownhosts(config["db.cloud.host"],config["db.cloud.username"],config["db.cloud.password"]) hosts = creds.keys() else: diff --git a/cloud.spec b/cloud.spec index b164ab03b7e..fd215a8ddfa 100644 --- a/cloud.spec +++ b/cloud.spec @@ -232,6 +232,9 @@ Requires: %{name}-daemonize Requires: /sbin/service Requires: /sbin/chkconfig Requires: kvm +%if 0%{?fedora} >= 13 +Requires: cloud-qemu-system-x86 +%endif Requires: libcgroup Requires: /usr/bin/uuidgen Requires: augeas >= 0.7.1 diff --git a/python/lib/cloud_utils.pyc b/python/lib/cloud_utils.pyc deleted file mode 100644 index 061c199488c..00000000000 Binary files a/python/lib/cloud_utils.pyc and /dev/null differ