diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-03-31 18:35:21 +0000 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-03-31 18:35:21 +0000 |
commit | 06f02b954f5c4ca7cb9cc288ea5a8fcb6a1052d4 (patch) | |
tree | c13a240d862ab3f62121062d4961b75a63d01e97 /apt-inst/filelist.cc | |
parent | 89eaeb446c24bbeacc5f69c170cf60104854432e (diff) | |
parent | 0edc7fba37048fa7c9833d664c4231ee9ad2be40 (diff) |
* merged with matts tree
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-72
Open 0.6.36
* apt@packages.debian.org/apt--main--0--patch-73
Merge apt--mvo--0
* apt@packages.debian.org/apt--main--0--patch-74
Update changelog
* apt@packages.debian.org/apt--main--0--patch-75
Merge bubulle@debian.org--2005/apt--main--0
* apt@packages.debian.org/apt--main--0--patch-76
Update changelog
* bubulle@debian.org--2005/apt--main--0--patch-58
Correct file permissions
* bubulle@debian.org--2005/apt--main--0--patch-59
Bring consistency to the use of capitals in programs messages
* bubulle@debian.org--2005/apt--main--0--patch-60
Correct the permission change on configure.in
* bubulle@debian.org--2005/apt--main--0--patch-61
Complete unfuzzification of PO files after the capitalization fixes
* bubulle@debian.org--2005/apt--main--0--patch-62
Final work of capitalization cleaning and translation unfuzzyfication
* bubulle@debian.org--2005/apt--main--0--patch-63
Correct the "arbitary" typo in apt-ftparchive
* bubulle@debian.org--2005/apt--main--0--patch-64
Italian translation update
* bubulle@debian.org--2005/apt--main--0--patch-65
Italian translation update
Diffstat (limited to 'apt-inst/filelist.cc')
-rw-r--r-- | apt-inst/filelist.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-inst/filelist.cc b/apt-inst/filelist.cc index 442dcdf06..f14c6416e 100644 --- a/apt-inst/filelist.cc +++ b/apt-inst/filelist.cc @@ -465,7 +465,7 @@ bool pkgFLCache::AddDiversion(PkgIterator const &Owner, // Should never happen if ((FromN->Flags & Node::Diversion) != Node::Diversion || (ToN->Flags & Node::Diversion) != Node::Diversion) - return _error->Error(_("Internal Error in AddDiversion")); + return _error->Error(_("Internal error in AddDiversion")); // Now, try to reclaim an existing diversion.. map_ptrloc Diver = 0; |