On Mon, Jul 10, 2017 at 12:12:23PM -0400, Richard Jones wrote: > > Checking out sources from https://github.com/libguestfs/libguestfs ... > > /var/tmp/tmppyH7Jl/libguestfs /var/tmp/tmppyH7Jl > Reset branch 'master' > Branch master set up to track remote branch master from origin. > Your branch is up-to-date with 'origin/master'. > >From github.com:libguestfs/libguestfs > 4cea914d2..28c375701 master -> origin/master > Updating 4cea914d2..28c375701 > Fast-forward > builder/templates/debian.preseed | 80 > ++++++++++++++++++++++++++++++-------- > builder/templates/make-template.ml | 59 +++++++++++++++++----------- > 2 files changed, 99 insertions(+), 40 deletions(-) > /var/tmp/tmppyH7Jl > > Applying patches ... > > /var/tmp/tmppyH7Jl/libguestfs /var/tmp/tmppyH7Jl > error: patch failed: builder/templates/debian.preseed:1 > error: builder/templates/debian.preseed: patch does not apply > Applying: builder: templates: update Debian preseed from Stretch > Patch failed at 0001 builder: templates: update Debian preseed from Stretch > The copy of the patch that failed is found in: .git/rebase-apply/patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort".
I think these patches went upstream before the test started ... So ignore this. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top _______________________________________________ Libguestfs mailing list [email protected] https://www.redhat.com/mailman/listinfo/libguestfs
