Browse Source

ensure "--db" also works with the new srcpkgdb

tags/debian/1.0.4
Michael Vogt 7 years ago
parent
commit
cf6bbca0a9
3 changed files with 35 additions and 2 deletions
  1. +8
    -0
      ftparchive/apt-ftparchive.cc
  2. +1
    -1
      ftparchive/cachedb.cc
  3. +26
    -1
      test/integration/test-apt-ftparchive-src-cachedb

+ 8
- 0
ftparchive/apt-ftparchive.cc View File

@@ -690,6 +690,10 @@ static bool SimpleGenPackages(CommandLine &CmdL)
if (Packages.RecursiveScan(CmdL.FileList[1]) == false)
return false;

// Give some stats if asked for
if(_config->FindB("APT::FTPArchive::ShowCacheMisses", false) == true)
c0out << " Misses in Cache: " << Packages.Stats.Misses<< endl;

return true;
}
/*}}}*/
@@ -746,6 +750,10 @@ static bool SimpleGenSources(CommandLine &CmdL)
if (Sources.RecursiveScan(CmdL.FileList[1]) == false)
return false;

// Give some stats if asked for
if(_config->FindB("APT::FTPArchive::ShowCacheMisses", false) == true)
c0out << " Misses in Cache: " << Sources.Stats.Misses<< endl;

return true;
}
/*}}}*/


+ 1
- 1
ftparchive/cachedb.cc View File

@@ -515,7 +515,7 @@ bool CacheDB::Finish()
if (CurStat.Flags == OldStat.Flags &&
CurStat.mtime == OldStat.mtime)
return true;
// Write the stat information
CurStat.Flags = htonl(CurStat.Flags);
CurStat.FileSize = htonl(CurStat.FileSize);


+ 26
- 1
test/integration/test-apt-ftparchive-src-cachedb View File

@@ -105,6 +105,30 @@ mkdir -p aptarchive/dists/test/main/source/

mkdir aptarchive-overrides
mkdir aptarchive-cache



# generate with --db option
(cd aptarchive && aptftparchive --db ./test.db sources pool/main/ \
-o APT::FTPArchive::ShowCacheMisses=1 \
> dists/test/main/source/Sources \
2> stats-out.txt
testequal " Misses in Cache: 2" grep Misses stats-out.txt
)
assert_correct_sources_file

# generate with --db option (again to ensure its in the cache)
(cd aptarchive && aptftparchive --db ./test.db sources pool/main/ \
-o APT::FTPArchive::ShowCacheMisses=1 \
> dists/test/main/source/Sources \
2> stats-out.txt
testequal " Misses in Cache: 0" grep Misses stats-out.txt
)
assert_correct_sources_file



# get ready for the "apt-ftparchive generate" command
cat > apt-ftparchive.conf <<"EOF"
Dir {
ArchiveDir "./aptarchive";
@@ -135,7 +159,6 @@ Tree "dists/test" {
};
EOF


# generate (empty cachedb)
aptftparchive generate apt-ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1 2> stats-out.txt
testequal " Misses in Cache: 2" grep Misses stats-out.txt
@@ -148,6 +171,8 @@ aptftparchive generate apt-ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1
testequal " Misses in Cache: 0" grep Misses stats-out.txt
assert_correct_sources_file



# generate invalid files
mkdir aptarchive/pool/invalid
printf "meep" > aptarchive/pool/invalid/invalid_1.0.dsc


Loading…
Cancel
Save