diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2014-09-02 16:34:05 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-09-02 16:34:05 +0200 |
| commit | 6763aaec8ddded31057733f53c63f15e6b949bd9 (patch) | |
| tree | 1da876a81081022834495463e44384c98c2ef78c | |
| parent | c6ee61eab54edf6cc3fbe118d304d72a860e1451 (diff) | |
Avoid yielding blank lines with APT::Cmd::use-format=true
| -rw-r--r-- | apt-private/private-list.cc | 3 | ||||
| -rw-r--r-- | apt-private/private-output.cc | 2 | ||||
| -rwxr-xr-x | test/integration/test-apt-cli-list | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc index f98456576..b69002103 100644 --- a/apt-private/private-list.cc +++ b/apt-private/private-list.cc @@ -93,6 +93,7 @@ static void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records,/*{{{*/ Ver.end() == false; ++Ver) { ListSingleVersion(CacheFile, records, Ver, outs, include_summary); + outs << "\n"; } } /*}}}*/ @@ -148,7 +149,7 @@ bool DoList(CommandLine &Cmd) // FIXME: SORT! and make sorting flexible (alphabetic, by pkg status) // output the sorted map for (K = output_map.begin(); K != output_map.end(); ++K) - std::cout << (*K).second; + std::cout << (*K).second << std::endl; // be nice and tell the user if there is more to see diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index 7f8922138..8f1fb886e 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -220,7 +220,7 @@ void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records, /*{{{*/ output = SubstVar(output, "${Version}", GetVersion(CacheFile, V)); output = SubstVar(output, "${Description}", GetShortDescription(CacheFile, records, P)); output = SubstVar(output, "${Origin}", GetArchiveSuite(CacheFile, V)); - out << output << std::endl; + out << output; } else { // raring/linux-kernel version [upradable: new-version] // description diff --git a/test/integration/test-apt-cli-list b/test/integration/test-apt-cli-list index 40bf81a39..aae74c022 100755 --- a/test/integration/test-apt-cli-list +++ b/test/integration/test-apt-cli-list @@ -68,4 +68,7 @@ testequal "Listing... baz/unstable 2.0 all [upgradable from: 0.1] N: There are 2 additional versions. Please use the '-a' switch to see them." apt list baz -o quiet=0 - +# test format strings for machine parseable output +apt list -qq bar baz -o APT::Cmd::use-format=true -o APT::Cmd::format="\${Package} - \${installed:Version} - \${candidate:Version}" > output.txt +testequal "bar - 1.0 - 1.0 +baz - 0.1 - 2.0" cat output.txt |