Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 697982 - app-admin/puppet-6.10.1 - Failed Patch: puppet-fix-tests-6.4.1.patch
Summary: app-admin/puppet-6.10.1 - Failed Patch: puppet-fix-tests-6.4.1.patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Matthew Thode ( prometheanfire )
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2019-10-18 15:32 UTC by Brian Evans (RETIRED)
Modified: 2019-10-18 16:19 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
puppet-fix-tests-6.4.1.patch.out (puppet-fix-tests-6.4.1.patch.out,3.59 KB, text/plain)
2019-10-18 15:34 UTC, Brian Evans (RETIRED)
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Brian Evans (RETIRED) gentoo-dev 2019-10-18 15:32:45 UTC
* Package:    app-admin/puppet-6.10.1
 * Repository: gentoo
 * Maintainer: prometheanfire@gentoo.org sysadmin@gentoo.org,ruby@gentoo.org
 * USE:        abi_x86_64 amd64 elibc_glibc kernel_linux ruby_targets_ruby25 userland_GNU
 * FEATURES:   network-sandbox preserve-libs sandbox userpriv usersandbox
>>> cfg-update-1.8.2-r1: Creating checksum index...
>>> Unpacking source...
 * Running unpack phase for all ...
>>> Unpacking puppet-6.10.1.tar.gz to /var/tmp/portage/app-admin/puppet-6.10.1/work/all
>>> Source unpacked in /var/tmp/portage/app-admin/puppet-6.10.1/work
>>> Preparing source in /var/tmp/portage/app-admin/puppet-6.10.1/work ...
 * Running prepare phase for all ...
 * Running prepare phase for all ...
 * Applying puppet-fix-tests-6.4.1.patch ...

 * Failed Patch: puppet-fix-tests-6.4.1.patch !
 *  ( /var/tmp/portage/app-admin/puppet-6.10.1/files/puppet-fix-tests-6.4.1.patch )
 *
 * Include in your bugreport the contents of:
 *
 *   /var/tmp/portage/app-admin/puppet-6.10.1/temp/puppet-fix-tests-6.4.1.patch.out
Comment 1 Brian Evans (RETIRED) gentoo-dev 2019-10-18 15:34:09 UTC
Created attachment 593152 [details]
puppet-fix-tests-6.4.1.patch.out

Patch output
Comment 2 Larry the Git Cow gentoo-dev 2019-10-18 16:03:10 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d613ebaa25d4ee4499e5a28a3322618e1797418

commit 8d613ebaa25d4ee4499e5a28a3322618e1797418
Author:     Matthew Thode <prometheanfire@gentoo.org>
AuthorDate: 2019-10-18 15:55:46 +0000
Commit:     Matthew Thode <prometheanfire@gentoo.org>
CommitDate: 2019-10-18 16:02:59 +0000

    app-admin/puppet: fix 6.10.1 patching
    
    Fixes: https://bugs.gentoo.org/697982
    Package-Manager: Portage-2.3.76, Repoman-2.3.17
    Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>

 .../puppet/files/puppet-fix-tests-6.10.1.patch     | 88 ++++++++++++++++++++++
 app-admin/puppet/puppet-6.10.1.ebuild              |  2 +-
 2 files changed, 89 insertions(+), 1 deletion(-)
Comment 3 Larry the Git Cow gentoo-dev 2019-10-18 16:19:24 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fc28526575fa8a99887606d2db998bccbac08d3

commit 2fc28526575fa8a99887606d2db998bccbac08d3
Author:     Matthew Thode <prometheanfire@gentoo.org>
AuthorDate: 2019-10-18 16:19:04 +0000
Commit:     Matthew Thode <prometheanfire@gentoo.org>
CommitDate: 2019-10-18 16:19:04 +0000

    app-admin/puppet: actually fix 6.10.1 patching
    
    Bug: https://bugs.gentoo.org/697982
    Package-Manager: Portage-2.3.76, Repoman-2.3.17
    Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>

 .../puppet/files/puppet-fix-tests-6.10.1.patch     | 107 ++++-----------------
 1 file changed, 19 insertions(+), 88 deletions(-)