[gnome-continuous] zdisks: Fix up previous commit
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] zdisks: Fix up previous commit
- Date: Fri, 27 Sep 2013 12:47:45 +0000 (UTC)
commit 75cd7eb7e62b0eac217e58530d2a08c422b1a3e7
Author: Colin Walters <walters verbum org>
Date: Fri Sep 27 08:46:45 2013 -0400
zdisks: Fix up previous commit
Use a less lame name for the disk images.
src/js/tasks/task-builddisks.js | 4 ++--
src/js/tasks/task-zdisks.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/js/tasks/task-builddisks.js b/src/js/tasks/task-builddisks.js
index 525fe72..10d638e 100644
--- a/src/js/tasks/task-builddisks.js
+++ b/src/js/tasks/task-builddisks.js
@@ -123,7 +123,7 @@ const TaskBuildDisks = new Lang.Class({
print("Bootloader installation complete");
}
- this._postDiskCreation(diskPath, cancellable);
+ this._postDiskCreation(squashedName, diskPath, cancellable);
print("post-disk creation complete");
}
@@ -148,7 +148,7 @@ const TaskBuildDisks = new Lang.Class({
baseImageVersionedDir.cleanOldVersions(IMAGE_RETAIN_COUNT, cancellable);
},
- _postDiskCreation: function(diskPath, cancellable) {
+ _postDiskCreation: function(squashedName, diskPath, cancellable) {
// Nothing, this is used by zdisks
}
});
diff --git a/src/js/tasks/task-zdisks.js b/src/js/tasks/task-zdisks.js
index bc15550..1297cc4 100644
--- a/src/js/tasks/task-zdisks.js
+++ b/src/js/tasks/task-zdisks.js
@@ -38,9 +38,9 @@ const TaskZDisks = new Lang.Class({
_inheritPreviousDisk: false,
_onlyTreeSuffixes: ['-runtime', '-devel-debug'],
- _postDiskCreation: function(diskPath, cancellable) {
+ _postDiskCreation: function(squashedName, diskPath, cancellable) {
let parent = diskPath.get_parent();
- let outPath = parent.get_child(diskPath.get_basename() + '-' + this._buildVersion + '.gz');
+ let outPath = parent.get_child(squashedName + '-' + this._buildVersion + '.qcow2.gz');
let outStream = outPath.create(Gio.FileCreateFlags.REPLACE_DESTINATION, cancellable);
let compressor = Gio.ZlibCompressor.new(Gio.ZlibCompressorFormat.GZIP, 7);
let outConverter = Gio.ConverterOutputStream.new(outStream, compressor);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]