[gnome-ostree] build: Ensure --patchdir actually overrides again
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-ostree] build: Ensure --patchdir actually overrides again
- Date: Thu, 20 Sep 2012 22:08:54 +0000 (UTC)
commit 103997900c0d8d5b32d5cbdf587f60139d20f98a
Author: Colin Walters <walters verbum org>
Date: Thu Sep 20 18:05:26 2012 -0400
build: Ensure --patchdir actually overrides again
Regression introduced by patch checkout optimizations.
src/ostbuild/pyostbuild/builtin_build.py | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/src/ostbuild/pyostbuild/builtin_build.py b/src/ostbuild/pyostbuild/builtin_build.py
index 8fced39..8107bda 100755
--- a/src/ostbuild/pyostbuild/builtin_build.py
+++ b/src/ostbuild/pyostbuild/builtin_build.py
@@ -145,7 +145,9 @@ class OstbuildBuild(builtins.Builtin):
if 'patches' in expanded_component:
patches_revision = expanded_component['patches']['revision']
- if self.cached_patchdir_revision == patches_revision:
+ if self.args.patches_path:
+ patchdir = self.args.patches_path
+ elif self.cached_patchdir_revision == patches_revision:
patchdir = self.patchdir
else:
patchdir = vcs.checkout_patches(self.mirrordir,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]