diff options
author | Luke Shumaker <lukeshu@parabola.nu> | 2017-02-19 16:32:57 -0500 |
---|---|---|
committer | Luke Shumaker <lukeshu@parabola.nu> | 2017-02-19 16:32:57 -0500 |
commit | 5e24be0651b2fb75b8fc957642bdc1920468dc76 (patch) | |
tree | 75957cb40b95ea824127012659af79cf8374e306 /archrelease | |
parent | 0136158b85fd33f505b119b8a6a297d4c9bc0d25 (diff) | |
parent | 58cc7feeafa9b29d65148044d9072369d9fabc46 (diff) | |
download | devtools32-5e24be0651b2fb75b8fc957642bdc1920468dc76.tar.xz |
Merge branch 'lukeshu/ng' into lukeshu/libretools
This is essentially merging the "archlinux" (upstream) branch. The
"lukeshu/ng" branch is all of the changes on the "lukeshu/libretools"
branch rebased on to "archlinux".
I did this instead of a simple merge so that I wouldn't have to worry
about the "big picture" when resolving conflicts; with rebasing I could
look at each atomic change.
Notable conflicts:
- "makechrootpkg: _chrootprepare: Clean srcdest and startdir."
I totally dropped this commit.
The surrounding code was removed in upsteam commit ca819a235791
("makechrootpkg: Simplify chroot preparation (v2)").
The change originated in libretools commit 564a4cfa06a8, but my
commit message doesn't give any insight as to why I made that change.
I've also scanned the issue tracker, and found no hints.
So dropping this is a little scary; I don't know why I thought it was
important in the first place.
- "makechrootpkg, arch-nspawn: Force-enable local '/repo/' repository."
I moved the code that force-updates `/var/lib/pacman/sync/repo.db
from _chrootprepare() into prepare_chroot().
Other than that, conflicts were mostly just the context changing.
Diffstat (limited to 'archrelease')
0 files changed, 0 insertions, 0 deletions