[gnome-ostree] build: When using overrides, do not reapply patches
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-ostree] build: When using overrides, do not reapply patches
- Date: Thu, 27 Jun 2013 22:25:01 +0000 (UTC)
commit e3d8a8ede18c2ed74bfedd1a53d8adce0fd1b439
Author: Colin Walters <walters verbum org>
Date: Thu Jun 27 18:22:23 2013 -0400
build: When using overrides, do not reapply patches
This makes the overrides system actually usable with components that
have patches; the expectation is that you already have a checkout with
the patches, and you have the ability to rebase or delete them as you
wish.
src/js/tasks/task-build.js | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/src/js/tasks/task-build.js b/src/js/tasks/task-build.js
index 34e8d6c..dccabc7 100644
--- a/src/js/tasks/task-build.js
+++ b/src/js/tasks/task-build.js
@@ -1054,6 +1054,9 @@ const TaskBuild = new Lang.Class({
if (overridePath.query_exists(null)) {
print("Using override: " + overridePath.get_path());
component['src'] = 'local:' + overridePath.get_path();
+ // We don't want to attempt to apply patches over top
+ // of what the override has.
+ delete component['patches'];
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]