Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 787272 - app-backup/backuppc-3.3.1-r6 patch backuppc-3.3.1-perl526.patch fails to apply
Summary: app-backup/backuppc-3.3.1-r6 patch backuppc-3.3.1-perl526.patch fails to apply
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: No maintainer - Look at https://wiki.gentoo.org/wiki/Project:Proxy_Maintainers if you want to take care of it
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-05-01 04:59 UTC by pogosyan
Modified: 2021-05-01 11:19 UTC (History)
3 users (show)

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


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description pogosyan 2021-05-01 04:59:11 UTC
update of backuppc-3.3.1-r6  fails due to failure of the  backuppc-3.3.1-perl526.patch. 

......
 * Applying backuppc-3.3.1-perl526.patch ...
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -ruN BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm BackupPC-3.3.1/lib/BackupPC/Lib.pm
|--- a/BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm  2015-01-12 01:19:53.000000000 +0100
|+++ b/BackupPC-3.3.1/lib/BackupPC/Lib.pm       2017-07-08 00:31:52.100003197 +0200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored                                                                                  [ !! ]
 * ERROR: app-backup/backuppc-3.3.1-r6::gentoo failed (prepare phase):
 *   patch -p1  failed with /dev/shm/portage/app-backup/backuppc-3.3.1-r6/files/backuppc-3.3.1-perl526.patch
........


The patch file reads 

diff -ruN BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm BackupPC-3.3.1/lib/BackupPC/Lib.pm
--- a/BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm   2015-01-12 01:19:53.000000000 +0100
+++ b/BackupPC-3.3.1/lib/BackupPC/Lib.pm        2017-07-08 00:31:52.100003197 +0200

which has incorrect paths.   Patch applies cleanly if changed to

diff -ruN BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm BackupPC-3.3.1/lib/BackupPC/Lib.pm
--- a/lib/BackupPC/Lib.pm   2015-01-12 01:19:53.000000000 +0100
+++ b/lib/BackupPC/Lib.pm   2017-07-08 00:31:52.100003197 +0200
Comment 1 Ionen Wolkens gentoo-dev 2021-05-01 05:24:46 UTC
Yes, looks like this broke in the EAPI-7 migration.

Before epatch.eclass would attempt -p2 if -p1 failed, but the patch should be updated instead now.
Comment 2 Ionen Wolkens gentoo-dev 2021-05-01 05:27:02 UTC
(In reply to Ionen Wolkens from comment #1)
> Before epatch.eclass would attempt -p2 if -p1 failed, but the patch should
> be updated instead now.
Or actually not what happened, it was updated but part of the path wasn't stripped.
Comment 3 Larry the Git Cow gentoo-dev 2021-05-01 11:19:46 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20bfd67bb2597bcf7884a81a62df555422ac1da3

commit 20bfd67bb2597bcf7884a81a62df555422ac1da3
Author:     Conrad Kostecki <conikost@gentoo.org>
AuthorDate: 2021-05-01 11:18:42 +0000
Commit:     Conrad Kostecki <conikost@gentoo.org>
CommitDate: 2021-05-01 11:18:42 +0000

    app-backup/backuppc: fix patch
    
    Closes: https://bugs.gentoo.org/787272
    Signed-off-by: Conrad Kostecki <conikost@gentoo.org>

 app-backup/backuppc/files/backuppc-3.3.1-perl526.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)