FS#26580 - When SRCDEST is set, makepkg --source does not include additional source files inside *.src.tar.gz

Attached to Project: Pacman
Opened by Sapphira Armageddos (ShadowKyogre) - Sunday, 23 October 2011, 06:12 GMT
Last edited by Allan McRae (Allan) - Monday, 09 January 2012, 00:41 GMT
Task Type Bug Report
Category makepkg
Status Closed
Assigned To Allan McRae (Allan)
Dave Reisner (falconindy)
Architecture All
Severity Low
Priority Normal
Reported Version 3.5.4
Due in Version 4.0.2
Due Date Undecided
Percent Complete 100%
Votes 0
Private No

Details

Description:
When SRCDEST is set to an alternate location other than the current directory of the PKGBUILD, running makepkg --source does not include the source files specified (eg: patches, etc.) in the generated source tarball. Attached is a patch to fix this problem, which checks for the source entry as it is literally in SRCDEST.

Additional info:
* pacman version is 3.5.4-4
* /etc/makepkg.conf is attached as well


Steps to reproduce:
1. Set SRCDEST to something.
2. Now run makepkg --source in the working directory of your choosing with the additional source files in SRCDEST only.
3. Open the generated source tarball.
4. It does not place the needed source files into the *.src.tar.gz.
   check_in_srcdest.patch (1 KiB)
   makepkg.conf (4.7 KiB)
This task depends upon

Closed by  Allan McRae (Allan)
Monday, 09 January 2012, 00:41 GMT
Reason for closing:  Fixed
Additional comments about closing:  commit 36413aa8
Comment by Sapphira Armageddos (ShadowKyogre) - Sunday, 23 October 2011, 06:17 GMT
Forgot to change the category to Packages: Core when I submitted this bug after I allowed noscript to allow scripts from archlinux.org. It would be greatly appreciated if the category for this bug could be changed quickly.
Comment by Dan McGee (toofishes) - Tuesday, 22 November 2011, 04:33 GMT
Is this 4.0.2 material? The fix (if correct) looks pretty simple, although the patch contains some whitespace fixes.
Comment by Sapphira Armageddos (ShadowKyogre) - Tuesday, 22 November 2011, 16:15 GMT
Although I found it in pacman 3.5.4, it does still appear in 4.0.1. I could make another patch against that version without the whitespace fixes.
Comment by Allan McRae (Allan) - Saturday, 26 November 2011, 22:20 GMT
This has also exposed an issue that "pacman --source" does not abort when it does not find a file. Normally that check is done with the integrity checks but combining --source with --skipinteg is interesting...
Comment by Dan McGee (toofishes) - Thursday, 05 January 2012, 22:39 GMT
Status for a potential 4.0.2 release?
Comment by Sapphira Armageddos (ShadowKyogre) - Sunday, 08 January 2012, 02:02 GMT
Here is the patch against the makepkg in the pacman 4.0.1 package. This also doesn't have the random whitespace fixes in here.
   check_in_srcdest.patch (0.5 KiB)
Comment by Allan McRae (Allan) - Sunday, 08 January 2012, 11:01 GMT
gitified patch on my working branch (see attached)
   0001-makepkg-look-in-SRCDEST-... (1 KiB)
Comment by Allan McRae (Allan) - Sunday, 08 January 2012, 11:41 GMT
This patch supersedes the previous one.
   0001-makepkg-simplify-source-... (1.3 KiB)

Loading...