git.annexia.org
/
goaljobs-goals.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't bother doing local rebuilds.
[goaljobs-goals.git]
/
fedora_ocaml_rebuild.ml
diff --git
a/fedora_ocaml_rebuild.ml
b/fedora_ocaml_rebuild.ml
index
85bdbec
..
fd8bd47
100644
(file)
--- a/
fedora_ocaml_rebuild.ml
+++ b/
fedora_ocaml_rebuild.ml
@@
-183,8
+183,12
@@
and rebuild_started pkg =
(* Ignored packages are treated as if they have been rebuilt. *)
if not (ignored pkg) then (
(* Ignored packages are treated as if they have been rebuilt. *)
if not (ignored pkg) then (
+(*
(* A local test build must succeed. *)
require (local_build_succeeded pkg);
(* A local test build must succeed. *)
require (local_build_succeeded pkg);
+*)
+ (* local_build_succeeded normally does this ... *)
+ require (specfile_updated pkg);
(* Rebuild the package in Koji. Don't wait ... *)
koji_build ~wait:false pkg branch;
(* Rebuild the package in Koji. Don't wait ... *)
koji_build ~wait:false pkg branch;
@@
-210,6
+214,7
@@
and rebuild_started pkg =
loop ()
)
loop ()
)
+(*
and local_build_succeeded pkg =
(* The specfile must have been updated. *)
require (specfile_updated pkg);
and local_build_succeeded pkg =
(* The specfile must have been updated. *)
require (specfile_updated pkg);
@@
-228,6
+233,7
@@
and local_build_succeeded pkg =
" (fedora_repo pkg branch);
memory_set key "1"
" (fedora_repo pkg branch);
memory_set key "1"
+*)
and specfile_updated pkg =
let repodir = fedora_repo pkg branch in
and specfile_updated pkg =
let repodir = fedora_repo pkg branch in
@@
-245,7
+251,9
@@
and specfile_updated pkg =
git pull --rebase
" repodir;
git pull --rebase
" repodir;
+(* - XXX why did we do this here?
install_build_dependencies pkg;
install_build_dependencies pkg;
+*)
(* For rationale behind always bumping the spec file, see comment
* in 'fedora.ml'.
(* For rationale behind always bumping the spec file, see comment
* in 'fedora.ml'.