X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fedora_ocaml_rebuild.ml;h=fd8bd47fa5b3845aa3ceb89efa79128c0ddb6273;hb=4b474a524994c85339b5f50b5d8df734a8efae96;hp=85bdbec65f4d9a255458363de38b46d212226704;hpb=0a426256cdda84f2c135c2f1cf76ea9d4ec30562;p=goaljobs-goals.git diff --git a/fedora_ocaml_rebuild.ml b/fedora_ocaml_rebuild.ml index 85bdbec..fd8bd47 100644 --- 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 ( +(* (* 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; @@ -210,6 +214,7 @@ and rebuild_started pkg = loop () ) +(* 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" +*) and specfile_updated pkg = let repodir = fedora_repo pkg branch in @@ -245,7 +251,9 @@ and specfile_updated pkg = git pull --rebase " repodir; +(* - XXX why did we do this here? install_build_dependencies pkg; +*) (* For rationale behind always bumping the spec file, see comment * in 'fedora.ml'.