Always create apt-ftparchive.conf. #20636
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
ping @jfrazelle (saw you closed #20564 already 😇 ) |
|
oh, and @tianon may be interested as well 👍 |
|
Clarification: This wouldnt fix #20564, since we have already overwritten the Releases files for 1.9.1 vivid. It would prevent such issues on EOL-ed distros from happening again. |
| # from EOL-ed distros. | ||
| if [ -f "$APTDIR/conf/apt-ftparchive.conf" ]; then | ||
| rm "$APTDIR/conf/apt-ftparchive.conf" | ||
| fi |
There was a problem hiding this comment.
Why explicitly remove and not just delete the if letting cat <<-EOF > "$APTDIR/conf/apt-ftparchive.conf" just overwrite?
|
(fyi https://github.com/docker/docker/pull/20636/files?w=1 is a much easier link to review here 👍 😄) |
The Releases file(s) and other bits for EOL-ed distros such as Ubuntu Vivid should remain untouched when we are releasing debs. However, few files in https://apt.dockerproject.org/repo/dists/ubuntu-vivid/ were being updated for the docker 1.10 release including the Release files. This is due to apt-ftparchive generating index files for vivid as well, due to the stale apt-ftparchive.conf This change always creates config using suites in contrib/reprepro/suites.sh. Signed-off-by: Anusha Ragunathan <anusha@docker.com>
anusha-ragunathan
force-pushed
the
apt-ftparchive
branch
from
208ee76 to
204c780
Compare
|
LGTM. @tianon ? |
|
Very nice, LGTM 👍 |
tianon
added a commit
that referenced
this pull request
Feb 26, 2016
Always create apt-ftparchive.conf.
|
ok im going to try this :) |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #20564
The Releases file(s) and other bits for EOL-ed distros such as Ubuntu
Vivid should remain untouched when we are releasing debs.
However, few files in https://apt.dockerproject.org/repo/dists/ubuntu-vivid/
were being updated for the docker 1.10 release including the Release files.
This is due to apt-ftparchive generating index files for vivid as well,
due to the stale apt-ftparchive.conf
This change removes any config files to avoid stale configs and always
creates config using suites in contrib/reprepro/suites.sh.
Signed-off-by: Anusha Ragunathan anusha@docker.com