keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zdisks: Use .bz2 for VDI files

Browse Source 
It turns out OS X has bzip2 but not xz installed by default, so let's
use that instead.  QCOW2 stays as xz since we can assume GNU/Linux
users have it better.
This commit is contained in:
Colin Walters 2014-02-01 15:27:22 -05:00
parent 2c7e4b5f91
commit 64bd4fc414
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/autobuilder/js/tasks/task-zdisks.js
View File

@ -57,6 +57,8 @@ const TaskZDisks = new Lang.Class({
if (!newDiskPath.query_exists(null)) { if (!newDiskPath.query_exists(null)) {
let newDiskPathTmp = Gio.File.new_for_path(revision + '.qcow2.xz.tmp'); let newDiskPathTmp = Gio.File.new_for_path(revision + '.qcow2.xz.tmp');
print("Creating " + newDiskPathTmp.get_path());
let xzCtx = new GSystem.SubprocessContext({ argv: [ 'xz' ] }) let xzCtx = new GSystem.SubprocessContext({ argv: [ 'xz' ] })
xzCtx.set_stdin_file_path(latestDisk.get_path()); xzCtx.set_stdin_file_path(latestDisk.get_path());
xzCtx.set_stdout_file_path(newDiskPathTmp.get_path()); xzCtx.set_stdout_file_path(newDiskPathTmp.get_path());
@ -73,10 +75,10 @@ const TaskZDisks = new Lang.Class({
newDiskPath, cancellable); newDiskPath, cancellable);
let vdiTmpPath = Gio.File.new_for_path(revision + '.vdi.tmp'); let vdiTmpPath = Gio.File.new_for_path(revision + '.vdi.tmp');
let newVdiPath = diskDir.get_child(revision + '.vdi.xz'); let newVdiPath = diskDir.get_child(revision + '.vdi.bz2');
let newVdiName = newVdiPath.get_basename(); let newVdiName = newVdiPath.get_basename();
if (!newVdiPath.query_exists(null)) { if (!newVdiPath.query_exists(null)) {
let newVdiPathTmp = Gio.File.new_for_path(revision + '.vdi.xz.tmp'); let newVdiPathTmp = Gio.File.new_for_path(revision + '.vdi.bz2.tmp');
print("Creating " + vdiTmpPath.get_path()); print("Creating " + vdiTmpPath.get_path());
ProcUtil.runSync(['qemu-img', 'convert', '-O', 'vdi', ProcUtil.runSync(['qemu-img', 'convert', '-O', 'vdi',
@ -85,7 +87,7 @@ const TaskZDisks = new Lang.Class({
{ logInitiation: true }); { logInitiation: true });
print("Creating " + newVdiPathTmp.get_path()); print("Creating " + newVdiPathTmp.get_path());
let xzCtx = new GSystem.SubprocessContext({ argv: [ 'xz' ] }) let xzCtx = new GSystem.SubprocessContext({ argv: [ 'bzip2' ] })
xzCtx.set_stdin_file_path(vdiTmpPath.get_path()); xzCtx.set_stdin_file_path(vdiTmpPath.get_path());
xzCtx.set_stdout_file_path(newVdiPathTmp.get_path()); xzCtx.set_stdout_file_path(newVdiPathTmp.get_path());
let xz = new GSystem.Subprocess({ context: xzCtx }); let xz = new GSystem.Subprocess({ context: xzCtx });
@ -98,7 +100,7 @@ const TaskZDisks = new Lang.Class({
} else { } else {
print("Already have " + newVdiPath.get_path()); print("Already have " + newVdiPath.get_path());
} }
BuildUtil.atomicSymlinkSwap(newVdiPath.get_parent().get_child('latest-vdi.xz'), BuildUtil.atomicSymlinkSwap(newVdiPath.get_parent().get_child('latest-vdi.bz2'),
newVdiPath, cancellable); newVdiPath, cancellable);
let e = null; let e = null;
@ -111,7 +113,7 @@ const TaskZDisks = new Lang.Class({
continue; continue;
let child = e.get_child(info); let child = e.get_child(info);
if (JSUtil.stringEndswith(name, '.qcow2.xz') || if (JSUtil.stringEndswith(name, '.qcow2.xz') ||
JSUtil.stringEndswith(name, '.vdi.xz')) { JSUtil.stringEndswith(name, '.vdi.bz2')) {
print("Removing old " + child.get_path()); print("Removing old " + child.get_path());
GSystem.file_unlink(child, cancellable); GSystem.file_unlink(child, cancellable);
} }