From 4fc06030b80f3b7c2f6d5dd80d65091c19b70b22 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 21 Apr 2008 11:13:13 +0300 Subject: [PATCH] Avoid %patch0 getting applied twice --- build/parsePrep.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/parsePrep.c b/build/parsePrep.c index c686321..ff51ff5 100644 --- a/build/parsePrep.c +++ b/build/parsePrep.c @@ -428,7 +428,8 @@ static rpmRC doPatchMacro(rpmSpec spec, const char *line) }; poptContext optCon; - opt_P = opt_p = opt_R = opt_E = 0; + opt_p = opt_R = opt_E = 0; + opt_P = -1; /* no explicit -P was found */ opt_F = -1; /* fuzz<0 indicates no explicit -F x was set */ opt_b = NULL; @@ -468,7 +469,7 @@ static rpmRC doPatchMacro(rpmSpec spec, const char *line) } /* %patch without -P is treated as %patch0, urgh */ - if (!opt_P) { + if (opt_P < 0) { argvAdd(&patchnums, "0"); } /* Any trailing arguments are treated as patch numbers */ -- 2.7.4