After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 351732 - Failed git update should break the build process
Failed git update should break the build process
Status: RESOLVED DUPLICATE of bug 345361
Product: jhbuild
Classification: Infrastructure
Component: general
unspecified
Other Linux
: Normal normal
: ---
Assigned To: Jhbuild maintainers
Jhbuild QA
Depends on:
Blocks:
 
 
Reported: 2006-08-17 08:45 UTC by Wouter Bolsterlee (uws)
Modified: 2006-09-11 13:39 UTC
See Also:
GNOME target: ---
GNOME version: ---


Description Wouter Bolsterlee (uws) 2006-08-17 08:45:57 UTC 
After a failed git update, jhbuild continues with the configure stage:

> *** Checking out cairo *** [1/1]
> 
> git pull
> Unpacking 67 objects
>  100% (67/67) done
> * refs/heads/origin: fast forward to branch 'master' of
>   git://git.freedesktop.org/git/cairo from
>   09e1eb04ca06aa5c188dc3bdad0dadadaa9fe31f to
>   6122cc85c8f71b1ba2df3ab86907768edebe1781
> Updating from 2d483e0785b18a8bb51f5b1c1a0267029f68a64a to
> 6122cc85c8f71b1ba2df3ab86907768edebe1781
> doc/public/tmpl/cairo-font-options.sgml: needs update
> [... more output ...]
> doc/public/tmpl/cairo.sgml: needs update
> fatal: Entry 'doc/public/tmpl/cairo-font-options.sgml' not uptodate. Cannot merge.
> 
> *** Configuring cairo *** [1/1]
> 

This case should be handled just like the "cvs conflicts" case: display a
menu with options, asking the user what to do next...

This issue caused me to NOT notice that I don't run Cairo "HEAD" for some
time now...
Comment 1 Frederic Peters 2006-08-17 09:14:00 UTC 
I just checked and, as expected, git doesn't set any return code.  I then checked
cogito which could have been used as alternative and it has the same problem.

This means jhbuild would have to check output, probably check for ^fatal: on
the last line, but current code doesn't make it easy.

James: there are extra checks for CVS in terminal.py::execute, do you have any
plan/idea about factoring them out so 1) they would be used by other frontends
and 2) they would also work for other version control systems ?
Comment 2 James Henstridge 2006-08-17 10:28:38 UTC 

*** This bug has been marked as a duplicate of 345361 ***