Browse Source

support " " in deb822 source options

tags/debian/0.9.15
Michael Vogt 7 years ago
parent
commit
41e6bd080d
2 changed files with 8 additions and 2 deletions
  1. +7
    -1
      apt-pkg/sourcelist.cc
  2. +1
    -1
      test/integration/test-apt-sources-deb822

+ 7
- 1
apt-pkg/sourcelist.cc View File

@@ -20,6 +20,7 @@
#include <apt-pkg/tagfile.h>

#include <fstream>
#include <algorithm>

#include <apti18n.h>
/*}}}*/
@@ -94,7 +95,12 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,
};
for (unsigned int j=0; j < sizeof(option_deb822)/sizeof(char*); j++)
if (Tags.Exists(option_deb822[j]))
Options[option_internal[j]] = Tags.FindS(option_deb822[j]);
{
// for deb822 the " " is the delimiter, but the backend expects ","
std::string option = Tags.FindS(option_deb822[j]);
std::replace(option.begin(), option.end(), ' ', ',');
Options[option_internal[j]] = option;
}
// now create one item per suite/section
string Suite = Tags.FindS("Suites");


+ 1
- 1
test/integration/test-apt-sources-deb822 View File

@@ -66,7 +66,7 @@ testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/P

msgtest 'Test deb822' 'architecture option'
echo "$BASE" > $SOURCES
echo "Architectures: amd64,armel" >> $SOURCES
echo "Architectures: amd64 armel" >> $SOURCES
testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-amd64/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-amd64_Packages 0 :
'http://ftp.debian.org/debian/dists/stable/main/binary-armel/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-armel_Packages 0 :
'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 :


Loading…
Cancel
Save