diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-11-16 16:21:04 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-11-16 16:21:04 +0000 |
| commit | 7230ad48a5c7766281c824c7373ecc8900e25995 (patch) | |
| tree | 15a6dc1171c9d2b9696b67c22c1b5d4c6c863a75 /apt-pkg/sourcelist.cc | |
| parent | 74a05226eff7041cd8f2380fe599862d350a1ac3 (diff) | |
| parent | 7e15443375875a15babd8bc35eeaef2785a06374 (diff) | |
* merged with apt--mvo--0
Patches applied:
* apt@packages.debian.org/apt--sources-list-d--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-30
* apt@packages.debian.org/apt--sources-list-d--0--patch-1
Patch from apt-rpm via Michael Vogt to implement /etc/apt/sources.list.d
* bubulle@debian.org--2005/apt--main--0--patch-96
Sync with Matt
* bubulle@debian.org--2005/apt--main--0--patch-97
Merge with Matt
* bubulle@debian.org--2005/apt--main--0--patch-98
Update PO files with the POT
* bubulle@debian.org--2005/apt--main--0--patch-99
Added Galician translation
* bubulle@debian.org--2005/apt--main--0--patch-100
Completed Danish translation
* bubulle@debian.org--2005/apt--main--0--patch-101
Merge with Matt
* bubulle@debian.org--2005/apt--main--0--patch-102
Merge with Michael Vogt's archive
* bubulle@debian.org--2005/apt--main--0--patch-103
Update the POT files and all PO files to resync with recent code
* bubulle@debian.org--2005/apt--main--0--patch-104
French translation completed
* bubulle@debian.org--2005/apt--main--0--patch-105
Proofread by Fred Bothamy
* bubulle@debian.org--2005/apt--main--0--patch-106
Merge with mvo
* bubulle@debian.org--2005/apt--main--0--patch-107
Italian translation corrected
* bubulle@debian.org--2005/apt--main--0--patch-108
Italian translation update
* bubulle@debian.org--2005/apt--main--0--patch-109
Italian translation completed
* bubulle@debian.org--2005/apt--main--0--patch-110
Swedish translation update
* bubulle@debian.org--2005/apt--main--0--patch-111
Merge with Michael
* bubulle@debian.org--2005/apt--main--0--patch-112
Swedish translation completed
* bubulle@debian.org--2005/apt--main--0--patch-113
Silly update to French translation (testing)
* bubulle@debian.org--2005/apt--main--0--patch-114
Basque translation update
* bubulle@debian.org--2005/apt--main--0--patch-115
Basque translation completed
* bubulle@debian.org--2005/apt--main--0--patch-116
Merge with Michael
* bubulle@debian.org--2005/apt--main--0--patch-117
Merge with Michael
* bubulle@debian.org--2005/apt--main--0--patch-118
Russian translation update by Yuri Kozlov
* bubulle@debian.org--2005/apt--main--0--patch-119
Merge with Michael and add update-po as a pre-req for binary
* bubulle@debian.org--2005/apt--main--0--patch-120
Re-generate all PO Files
* bubulle@debian.org--2005/apt--main--0--patch-121
Complete French translation
* bubulle@debian.org--2005/apt--main--0--patch-122
Correct typography in French translation
* bubulle@debian.org--2005/apt--main--0--patch-123
Spelling fix for consistency in French translation
* bubulle@debian.org--2005/apt--main--0--patch-124
Merge with Michael
* bubulle@debian.org--2005/apt--main--0--patch-125
Fixed localization of y/n questions in German translation
* bubulle@debian.org--2005/apt--main--0--patch-126
Swedish translation update
* bubulle@debian.org--2005/apt--main--0--patch-127
Complete Tagalog translation / Add Changelog
* bubulle@debian.org--2005/apt--main--0--patch-128
Danish translation update
* bubulle@debian.org--2005/apt--main--0--patch-129
Basque translation update
* bubulle@debian.org--2005/apt--main--0--patch-130
Galician translation completed
* bubulle@debian.org--2005/apt--main--0--patch-131
Simplified Chinese translation update
* michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-5
* merged with apt--main--0
* michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-6
* fixed a incorrect po/he.po merge
* michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-110
* michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--patch-1
* initial patch to make falling back from cdrom possible
* michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--patch-2
* fix in methods/cdrom.cc: don't call Fail() but return false so that apt can fallback to a differencent source
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-10
* fix a bug in a man-page, fix a problem with overly long lines in apt-cdrom
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-11
* merged with apt--main--0
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-12
* fix a incorrect error message (it always added .gz regardless what was downloaded)
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-13
* merged with main
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-14
* added Hashsum support for file and cdrom
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-15
* added README.arch
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-16
* merged with main
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-17
* move the changelog to the right place
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-18
* Change pkgPolicy::Pin from private to protected
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-19
* added a default constructor for PrvIterator
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-20
* applied otavios patch to reread the statusFile on debSystem::Initialize
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-33
* merged with matt's tree
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-34
* merged with matts tree
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-35
* build debian and ubuntu package from the same source
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-36
* added debian/patches dir
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-37
* fix the breakage from my last commit (note to self: always, _always_ run baz diff before a commit)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-38
* removed the lsb_release build patch (nobody except me seems to like it)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-39
* merged from main
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-40
* merged the apt--sane-handle-timeout--0 branch
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-41
* merged apt--bts225947--0
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-42
* merged with apt--main
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-43
* added patch that adds a apt-secure man-page (thanks to jfs@computer.org)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-44
* added author credits
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-45
* added apt-ftparchive.conf example
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-46
* corrected the utf8 of javier fernandes pena
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-47
* improve the timeout handling (again)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-48
* merged with apt--fixes--0
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-49
* README.arch updates, comment in apt-pkg/algorithm.h added, apt-pkg/cacheiterators.h order in initlist changed to remove warning
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-50
* meda-change message is send over status-fd now
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-51
* include a human readable string for the MediaChange status-fd message as well
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-52
* finalizing changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-53
* check ctime as well in cron.daily when cleaning up packages in apt.cron.daily
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-54
* fix a stupid typo in apt.cron.daily
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55
* fix apt-pkg/cdrom.cc to umount the cdrom again if anything fails
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56
* merged from apt--cdrom-fallback--0
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-57
* changelog update
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-58
* better error string for a failed dpkg-source
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-59
* make sure that the pkgRecords D'tor does not segfault
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-60
* merged updated french man-page
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-61
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62
* leak fix for debian #250583
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-63
* changelog update
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-64
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-65
* inital support for "apt-get source -t dist" (but no downgrades yet
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-66
* full support for apt-get source -t now (and honor pining too)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-67
* added APT::Authentication::Trust-CDROM option
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-68
* fix a crash in apt-ftparchive
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-69
* sparc64 alignment fix
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-70
* fix segfault when there is no Archive for a VerFile
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-71
* don't get candidate release as version tag for FindSrc by default. because it break for bin-NMUs :/ (e.g. dpkg source is 1.13.11, but i386 version string is 1.13.11.0.1)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-72
* corrections in the changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-73
* init the default ScreenWidth to 79 columns by default (Closes: #324921)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-74
apt-cdrom.cc:fix some missing gettext() calls (closes: #334539); doc/apt-cache.8.xml: fix typo (closes: #334714)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-75
* seting section to "admin" to match override file
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-76
* finalized the changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-77
* renamed Trust-CDROM to TrustCDROM to make it consistent with ubuntu
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-78
* fix a incorrect example
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-79
* revert patch from patch-59, causes all sorts of trouble
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-80
* fix changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-81
* be extra carefull in cmdline/apt-get.cc:FindSrc() and check VF.File() for NULL
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-82
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-83
* cmdline/apt-get.cc: fix bug in FindSrc() (debian #335213)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-84
* added armeb to archtable
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-85
* merged with bubulle, changelog updates
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-86
* merged the NMU from Franz Pop, fixed armeb problem (#333599)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-87
* removed double armeb entry in buildlib/sizetable
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-88
* finalized changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-89
* turn off "secure-acquire" when --allow-unauthenticated is given
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-90
* merged the sources.list.d patch
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-91
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-92
* changelog update
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-93
* sources.list.d documented
* michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-3
* merged with main
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-79
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-1
* implemented "TrustCDROM" mode
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-2
* added APT::Authentication::TrustCDROM to the configure-index
* otavio@debian.org--2005/apt--fixes--0--patch-28
Reread status configuration, needed for clients using independent apt ...
* philippe.batailler@free.fr--2005/VOGTapt--mvo--0--patch-1
French L10N update
* philippe.batailler@free.fr--2005/VOGTapt--mvo--0--patch-2
Generate correctly french manpages
Diffstat (limited to 'apt-pkg/sourcelist.cc')
| -rw-r--r-- | apt-pkg/sourcelist.cc | 115 |
1 files changed, 110 insertions, 5 deletions
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 95aba0cb5..db895a6c1 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: sourcelist.cc,v 1.25 2004/06/07 23:08:00 mdz Exp $ +// $Id: sourcelist.cc,v 1.3 2002/08/15 20:51:37 niemeyer Exp $ /* ###################################################################### List of Sources @@ -21,6 +21,13 @@ #include <apti18n.h> #include <fstream> + +// CNC:2003-03-03 - This is needed for ReadDir stuff. +#include <algorithm> +#include <stdio.h> +#include <dirent.h> +#include <sys/stat.h> +#include <unistd.h> /*}}}*/ using namespace std; @@ -142,23 +149,66 @@ pkgSourceList::~pkgSourceList() /* */ bool pkgSourceList::ReadMainList() { - return Read(_config->FindFile("Dir::Etc::sourcelist")); + // CNC:2003-03-03 - Multiple sources list support. + bool Res = true; +#if 0 + Res = ReadVendors(); + if (Res == false) + return false; +#endif + + Reset(); + // CNC:2003-11-28 - Entries in sources.list have priority over + // entries in sources.list.d. + string Main = _config->FindFile("Dir::Etc::sourcelist"); + if (FileExists(Main) == true) + Res &= ReadAppend(Main); + + string Parts = _config->FindDir("Dir::Etc::sourceparts"); + if (FileExists(Parts) == true) + Res &= ReadSourceDir(Parts); + + return Res; } /*}}}*/ +// CNC:2003-03-03 - Needed to preserve backwards compatibility. +// SourceList::Reset - Clear the sourcelist contents /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void pkgSourceList::Reset() +{ + for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++) + delete *I; + SrcList.erase(SrcList.begin(),SrcList.end()); +} + /*}}}*/ +// CNC:2003-03-03 - Function moved to ReadAppend() and Reset(). // SourceList::Read - Parse the sourcelist file /*{{{*/ // --------------------------------------------------------------------- /* */ bool pkgSourceList::Read(string File) { + Reset(); + return ReadAppend(File); +} + /*}}}*/ +// SourceList::ReadAppend - Parse a sourcelist file /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgSourceList::ReadAppend(string File) +{ // Open the stream for reading ifstream F(File.c_str(),ios::in /*| ios::nocreate*/); if (!F != 0) return _error->Errno("ifstream::ifstream",_("Opening %s"),File.c_str()); +#if 0 // Now Reset() does this. for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++) delete *I; SrcList.erase(SrcList.begin(),SrcList.end()); - char Buffer[300]; +#endif + // CNC:2003-12-10 - 300 is too short. + char Buffer[1024]; int CurLine = 0; while (F.eof() == false) @@ -172,7 +222,10 @@ bool pkgSourceList::Read(string File) char *I; - for (I = Buffer; *I != 0 && *I != '#'; I++); + // CNC:2003-02-20 - Do not break if '#' is inside []. + for (I = Buffer; *I != 0 && *I != '#'; I++) + if (*I == '[') + for (I++; *I != 0 && *I != ']'; I++); *I = 0; const char *C = _strstrip(Buffer); @@ -188,7 +241,7 @@ bool pkgSourceList::Read(string File) Type *Parse = Type::GetType(LineType.c_str()); if (Parse == 0) - return _error->Error(_("Type '%s' is not known on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str()); + return _error->Error(_("Type '%s' is not known in on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str()); // Vendor name specified if (C[0] == '[') @@ -259,3 +312,55 @@ bool pkgSourceList::GetIndexes(pkgAcquire *Owner, bool GetAll) const return true; } /*}}}*/ +// CNC:2003-03-03 - By Anton V. Denisov <avd@altlinux.org>. +// SourceList::ReadSourceDir - Read a directory with sources files +// Based on ReadConfigDir() /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgSourceList::ReadSourceDir(string Dir) +{ + DIR *D = opendir(Dir.c_str()); + if (D == 0) + return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str()); + + vector<string> List; + + for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) + { + if (Ent->d_name[0] == '.') + continue; + + // CNC:2003-12-02 Only accept .list files as valid sourceparts + if (flExtension(Ent->d_name) != "list") + continue; + + // Skip bad file names ala run-parts + const char *C = Ent->d_name; + for (; *C != 0; C++) + if (isalpha(*C) == 0 && isdigit(*C) == 0 + && *C != '_' && *C != '-' && *C != '.') + break; + if (*C != 0) + continue; + + // Make sure it is a file and not something else + string File = flCombine(Dir,Ent->d_name); + struct stat St; + if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0) + continue; + + List.push_back(File); + } + closedir(D); + + sort(List.begin(),List.end()); + + // Read the files + for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++) + if (ReadAppend(*I) == false) + return false; + return true; + +} + /*}}}*/ + |