diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-06-26 09:56:37 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-06-26 09:56:37 +0000 |
| commit | 6804503b9bd057fae67294bb8ca95c9f10e00194 (patch) | |
| tree | 709e06cf6fc66bc085cd385d501d6fc145fae0bb /apt-inst | |
| parent | bebfc824a8d5da1f05fea1c8502771ad569916fc (diff) | |
| download | apt-6804503b9bd057fae67294bb8ca95c9f10e00194.tar.gz | |
* merged/removed conflicts with apt--main--0
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-80
Merge michael.vogt@ubuntu.com--2005/apt--fixes--0
* apt@packages.debian.org/apt--main--0--patch-81
Open 0.6.37
* apt@packages.debian.org/apt--main--0--patch-82
merge bubulle@debian.org--2005/apt--main--0
* apt@packages.debian.org/apt--main--0--patch-83
Update changelog
* apt@packages.debian.org/apt--main--0--patch-84
Fix build of French man pages (now using XML, not SGML)
* apt@packages.debian.org/apt--main--0--patch-85
Merge patch from Philippe Batailler for French man page build
* apt@packages.debian.org/apt--main--0--patch-86
add Welsh translations from Dafydd Harries
* apt@packages.debian.org/apt--main--0--patch-87
Update changelog
* apt@packages.debian.org/apt--main--0--patch-88
Change debian/bugscript to use #!/bin/bash (Closes: #313402)
* apt@packages.debian.org/apt--main--0--patch-89
Branch for Debian
* apt@packages.debian.org/apt--main--0--patch-90
Update version in configure
* apt@packages.debian.org/apt--main--0--patch-91
Fix French man page build
* apt@packages.debian.org/apt--main--0--patch-92
Add the current Debian archive signing key
* bubulle@debian.org--2005/apt--main--0--patch-66
Italian translation complete
* bubulle@debian.org--2005/apt--main--0--patch-67
Sync with Matt
* bubulle@debian.org--2005/apt--main--0--patch-68
Sync with Matt
* bubulle@debian.org--2005/apt--main--0--patch-69
Sync with Matt
* bubulle@debian.org--2005/apt--main--0--patch-70
Re-generate the POT and PO files from sources
* bubulle@debian.org--2005/apt--main--0--patch-71
Update French translation
* bubulle@debian.org--2005/apt--main--0--patch-72
Merge with Matt
* bubulle@debian.org--2005/apt--main--0--patch-73
Basque translation update
* bubulle@debian.org--2005/apt--main--0--patch-74
Hebres translation update
* bubulle@debian.org--2005/apt--main--0--patch-75
Merge with Matt
* bubulle@debian.org--2005/apt--main--0--patch-76
Correct the Hebrew translation for #306658
* bubulle@debian.org--2005/apt--main--0--patch-77
Update French man pages translations
* bubulle@debian.org--2005/apt--main--0--patch-78
Merge with Matt
* bubulle@debian.org--2005/apt--main--0--patch-79
Correct syntax errors in Hebrew translation
* bubulle@debian.org--2005/apt--main--0--patch-80
Revert changes to debian/changelog and debian/apt.cron.daily
* bubulle@debian.org--2005/apt--main--0--patch-81
Portuguese translation update
* daf@muse.19inch.net--2005/apt--main--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-85
* daf@muse.19inch.net--2005/apt--main--0--patch-1
add Welsh translation
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6
* build fix for apt--main--0
* philippe.batailler@free.fr--2005/apt--mainBubulle--0.1--patch-1
Passage sous arch
* philippe.batailler@free.fr--2005/apt--mainMatt--0--patch-1
fix xml error
Diffstat (limited to 'apt-inst')
| -rw-r--r-- | apt-inst/deb/dpkgdb.cc | 2 | ||||
| -rw-r--r-- | apt-inst/dirstream.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc index 7b7e90acd..c6a0e80e6 100644 --- a/apt-inst/deb/dpkgdb.cc +++ b/apt-inst/deb/dpkgdb.cc @@ -380,7 +380,7 @@ bool debDpkgDB::ReadDiversions() bool debDpkgDB::ReadyFileList(OpProgress &Progress) { if (Cache == 0) - return _error->Error(_("The pkg cache must be initialize first")); + return _error->Error(_("The pkg cache must be initialized first")); if (FList != 0) { Progress.OverallProgress(1,1,1,_("Reading file list")); diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc index a8a4d9c0d..7ae93c9b0 100644 --- a/apt-inst/dirstream.cc +++ b/apt-inst/dirstream.cc @@ -42,15 +42,15 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd) int iFd = open(Itm.Name,O_NDELAY|O_WRONLY|O_CREAT|O_TRUNC|O_APPEND, Itm.Mode); if (iFd < 0) - return _error->Errno("open",_("Failed write file %s"), + return _error->Errno("open",_("Failed to write file %s"), Itm.Name); // fchmod deals with umask and fchown sets the ownership if (fchmod(iFd,Itm.Mode) != 0) - return _error->Errno("fchmod",_("Failed write file %s"), + return _error->Errno("fchmod",_("Failed to write file %s"), Itm.Name); if (fchown(iFd,Itm.UID,Itm.GID) != 0 && errno != EPERM) - return _error->Errno("fchown",_("Failed write file %s"), + return _error->Errno("fchown",_("Failed to write file %s"), Itm.Name); Fd = iFd; return true; |