projects
/
tools
/
librpm-tizen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b803407
)
Avoid %patch0 getting applied twice
author
Panu Matilainen
<pmatilai@redhat.com>
Mon, 21 Apr 2008 08:13:13 +0000
(11:13 +0300)
committer
Panu Matilainen
<pmatilai@redhat.com>
Mon, 21 Apr 2008 08:13:13 +0000
(11:13 +0300)
build/parsePrep.c
patch
|
blob
|
history
diff --git
a/build/parsePrep.c
b/build/parsePrep.c
index
c686321
..
ff51ff5
100644
(file)
--- 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 <N> 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<N> is treated as %patch0, urgh */
- if (
!opt_P
) {
+ if (
opt_P < 0
) {
argvAdd(&patchnums, "0");
}
/* Any trailing arguments are treated as patch numbers */