Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix minor logic hole in source matching

This commit is contained in:
Steve McIntyre 2013-02-01 03:49:49 +00:00
parent 9d50fdb6f1
commit 183ce1c83f
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -220,6 +220,17 @@ $(ADIR)/status:
export ARCH=$$ARCH; \ export ARCH=$$ARCH; \
$(apt) update; \ $(apt) update; \
done done
# If we're doing a build using d-i from sid, we'll need sid sources too
if [ "$(INC_SOURCE)"x = "yes"x ] && \
[ "$(DI_CODENAME)"x != ""x ] && \
[ "$(DI_CODENAME}"x != "$(CODENAME)"x ] ; then \
mkdir -p $(ADIR)/$(DI_CODENAME)-source/apt/preferences.d ; \
:> $(ADIR)/$(DI_CODENAME)-source/status ; \
export CODENAME=$(DI_CODENAME); \
export ARCH=source; \
$(apt) update; \
fi
# #
# Checking the consistency of the standard system # Checking the consistency of the standard system
# If this does fail, then launch make correctstatus # If this does fail, then launch make correctstatus

2
tools/merge_package_lists
View File

@ -65,7 +65,6 @@ if [ $source = "yes" ] ; then
/^Package:/ { /^Package:/ {
srcname=$2 srcname=$2
srcs_done++ srcs_done++
num_sources = 0
} }
/^Binary:/ { /^Binary:/ {
@ -117,6 +116,7 @@ if [ $source = "yes" ] ; then
in_files = 0 in_files = 0
in_binary = 0 in_binary = 0
if (parsed) { if (parsed) {
num_sources = 0
split($0,fields,":") split($0,fields,":")
arch=fields[1] arch=fields[1]
component=fields[2] component=fields[2]