- sort --list output

- Added libvirt warning
- getting ready for next release, though no immediate need for above features

5 files changed, 16 insertions, 3 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 02153acc..2aa04801 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,10 @@ Detail of software changes that are not packaging related.
 These *should* correspond with a bump in the software version.  This
 wasn't consistant for 0.1.X builds, though it will be in the future.
 
+* Thr Jan 24 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.6-1
+- koan --list commands now sort output
+- Added warning text when koan fails to import virtualization modules
+
 * Fri Dec 08 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.5-1
 - Now probes bootloader to determine what bootloader to edit, rather
   than using the first installed package.
diff --git a/koan.spec b/koan.spec
index 7dbb74ca..120a025b 100644
--- a/koan.spec
+++ b/koan.spec
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Existing Non-Bare Metal
 Name: koan
-Version: 0.2.5
+Version: 0.2.6
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -48,6 +48,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Thu Jan 24 2006 - Michael DeHaan <mdehaan@redhat.com> - 0.2.6-1
+- Upstream changes (see CHANGELOG)
+
 * Fri Dec 08 2006 - Michael DeHaan <mdehaan@redhat.com> - 0.2.5-1
 - Upstream changes (see CHANGELOG)
 - tweaked MANIFEST.in to appease rhel3 builds
diff --git a/koan/app.py b/koan/app.py
index e73080d4..30093f7b 100755
--- a/koan/app.py
+++ b/koan/app.py
@@ -280,6 +280,7 @@ class Koan:
             # FIXME
             data = self.urlread(url)
             data = yaml.load(data).next() # first record
+            data = data.sort()
             for x in data:
                 print "%s" % x
             return True
diff --git a/koan/virtcreate.py b/koan/virtcreate.py
index c6252c1e..e587ab4e 100755
--- a/koan/virtcreate.py
+++ b/koan/virtcreate.py
@@ -170,7 +170,12 @@ def start_paravirt_install(name=None, ram=None, disk=None, mac=None,
                            uuid=None, kernel=None, initrd=None, extra=None):
     # this app works without libvirt (for auto-kickstart functionality)
     # but using xen functions will require it...
-    import libvirt
+    try:
+         import libvirt
+    except:
+         print "Usage of this feature requires installing libvirt-python."
+         print "A version of python >= 2.4 is also required for usage of libvirt-python."
+         print "These items are not required to use koan --replace-self, however."
 
     (kfn, ifn) = get_paravirt_install_image(kernel, initrd)
     if stat.S_ISBLK(os.stat(disk)[stat.ST_MODE]):
diff --git a/setup.py b/setup.py
index f1556d5d..905830f0 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import sys
 from distutils.core import setup, Extension
 import string
 
-VERSION = "0.2.5"
+VERSION = "0.2.6"
 SHORT_DESC = "Network provisioning tool for Virtualized Images and Existing Non-Bare Metal"
 LONG_DESC = """
 koan stands for "kickstart-over-a-network" and allows for both