summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:52:07 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:52:07 +0000
commit2c78c00b56d1182e4420b7a59b43780d134ffad2 (patch)
treeed5bfd14fb45c3171b8d39547e410275122d74d4
parente02343acf6fc7f5632d4440c7e0cb882dd9e1d82 (diff)
Another -a attempt
Author: jgg Date: 1998-12-09 00:55:23 GMT Another -a attempt
-rw-r--r--cmdline/apt-cdrom.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index dc4cc3cd6..a4b60e457 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: apt-cdrom.cc,v 1.10 1998/12/09 00:31:16 jgg Exp $
+// $Id: apt-cdrom.cc,v 1.11 1998/12/09 00:55:23 jgg Exp $
/* ######################################################################
APT CDROM - Tool for handling APT's CDROM database.
@@ -38,10 +38,9 @@
search that short circuits when it his a package file in the dir.
This speeds it up greatly as the majority of the size is in the
binary-* sub dirs. */
-ino_t Inodes[9];
-
bool FindPackages(string CD,vector<string> &List, unsigned int Depth = 0)
{
+ static ino_t Inodes[9];
if (Depth >= 7)
return true;
@@ -182,7 +181,7 @@ bool DropRepeats(vector<string> &List)
for (unsigned int I = 0; I != List.size(); I++)
{
struct stat Buf;
- if (stat(List[I].c_str(),&Buf) != 0)
+ if (stat((List[I] + "Packages").c_str(),&Buf) != 0)
_error->Errno("stat","Failed to stat %s",List[I].c_str());
Inodes[I] = Buf.st_ino;
}