[gnome-continuous] Extract relpathToVersion to toplevel
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] Extract relpathToVersion to toplevel
- Date: Mon, 18 Nov 2013 00:08:43 +0000 (UTC)
commit 01e370e982f351ba002ba156378a0027cf6077e4
Author: Colin Walters <walters verbum org>
Date: Sun Nov 17 19:07:25 2013 -0500
Extract relpathToVersion to toplevel
Just cleaner.
src/js/task.js | 2 +-
src/js/versioneddir.js | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/js/task.js b/src/js/task.js
index d5f0930..2089706 100644
--- a/src/js/task.js
+++ b/src/js/task.js
@@ -345,7 +345,7 @@ const Task = new Lang.Class({
this.builddir = Gio.File.new_for_path(GLib.getenv('_OSTBUILD_BUILDDIR'));
let relpath = this.workdir.get_relative_path(this.builddir);
- this._buildName = VersionedDir.VersionedDir.prototype.relpathToVersion(relpath);
+ this._buildName = VersionedDir.relpathToVersion(relpath);
this.mirrordir = this.workdir.get_child('src');
GSystem.file_ensure_directory(this.mirrordir, true, null);
diff --git a/src/js/versioneddir.js b/src/js/versioneddir.js
index 6705180..3db6dc4 100644
--- a/src/js/versioneddir.js
+++ b/src/js/versioneddir.js
@@ -23,6 +23,11 @@ const Format = imports.format;
const GSystem = imports.gi.GSystem;
const BuildUtil = imports.buildutil;
+function relpathToVersion(relpath) {
+ let parts = relpath.split('/');
+ return parts[0] + parts[1] + parts[2] + '.' + parts[3];
+}
+
const VersionedDir = new Lang.Class({
Name: 'VersionedDir',
@@ -93,13 +98,8 @@ const VersionedDir = new Lang.Class({
}), cancellable);
},
- relpathToVersion: function(relpath) {
- let parts = relpath.split('/');
- return parts[0] + parts[1] + parts[2] + '.' + parts[3];
- },
-
pathToVersion: function(path) {
- return this.relpathToVersion(this.path.get_relative_path(path));
+ return relpathToVersion(this.path.get_relative_path(path));
},
loadVersions: function(cancellable) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]