Merge pull request #344 from miabbott/el7_pile_o_fixes

EL7 compatibility fixes

src/cmd-oscontainer

@@ -42,7 +42,7 @@ def oscontainer_extract(containers_storage, src, dest,
     if commit is None:
         raise SystemExit("Failed to find label '{}'".format(OSCONTAINER_COMMIT_LABEL))
     iid = inspect['Id']
-    print(f"Preparing to extract cid: {iid}")
+    print("Preparing to extract cid: {}".format(iid))
     # We're not actually going to run the container. The main thing `create` does
     # then for us is "materialize" the merged rootfs, so we can mount it.
     # In theory we shouldn't need --entrypoint=/enoent here, but

src/deps.txt

@@ -14,7 +14,9 @@ rpm-ostree createrepo_c openssh-clients
 #EL7 yum-utils
 
 # For generating ISO images
-genisoimage syslinux-nonlinux
+genisoimage
+#FEDORA syslinux-nonlinux
+#EL7 syslinux
 
 # We expect people to use these explicitly in their repo configurations.
 #FEDORA distribution-gpg-keys
@@ -25,7 +27,9 @@ selinux-policy-targeted rpm-build
 make git rpm-build
 
 # virt-install dependencies
-libvirt libguestfs-tools qemu-kvm /usr/bin/qemu-img /usr/bin/virsh /usr/bin/virt-install
+libvirt libguestfs-tools /usr/bin/qemu-img /usr/bin/virsh /usr/bin/virt-install
+#FEDORA qemu-kvm
+#EL7 qemu-kvm-rhev
 
 # And we process kickstarts
 /usr/bin/ksflatten