From 9504f6f95ba38205551275f94069799ce8683657 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 2 Oct 2007 09:25:37 -0300 Subject: - apt-pkg/cdrom.cc: '%lu' expects 'long unsigned int', but argument has type 'size_t'; --- apt-pkg/cdrom.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apt-pkg/cdrom.cc') diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 96106c7a9..b8f94e5b0 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -668,8 +668,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log) DropRepeats(TransList,""); if(log) { msg.str(""); - ioprintf(msg, _("Found %lu package indexes, %lu source indexes, " - "%lu translation indexes and %lu signatures\n"), + ioprintf(msg, _("Found %u package indexes, %u source indexes, " + "%u translation indexes and %u signatures\n"), List.size(), SourceList.size(), TransList.size(), SigList.size()); log->Update(msg.str(), STEP_SCAN); -- cgit v1.2.3-70-g09d2 From 36fb926eada14ae6d3cb7f7658d95fb8c8013812 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 26 Oct 2007 18:08:18 -0200 Subject: * Applied patch from Frans Pop to fix a trailing space after cd label, closes: #448187. --- apt-pkg/cdrom.cc | 4 ++-- debian/changelog | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'apt-pkg/cdrom.cc') diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index b8f94e5b0..afb067559 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -560,8 +560,8 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) } if(log) { msg.str(""); - ioprintf(msg, _("Stored label: %s \n"), - Database.Find("CD::"+ident).c_str()); + ioprintf(msg, _("Stored label: %s\n"), + Database.Find("CD::"+ident).c_str()); log->Update(msg.str()); } return true; diff --git a/debian/changelog b/debian/changelog index f29fc1b20..e0a6a7736 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ apt (0.7.8) UNRELEASED; urgency=low APT::Acquire::Translation "none" support, closes: #437523. * Applied patch from Daniel Burrows to add support for the Homepage field (ABI break), closes: #447970. + * Applied patch from Frans Pop to fix a trailing + space after cd label, closes: #448187. - -- Otavio Salvador Thu, 25 Oct 2007 13:47:00 -0200 + -- Otavio Salvador Fri, 26 Oct 2007 18:07:06 -0200 apt (0.7.7) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 1fcbe14d0cc5bf9892b0176993a884acffbd6ed7 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 29 Oct 2007 18:29:39 -0200 Subject: * Umount CD-ROM when calling apt-cdrom ident, except when called with -m, closes: #448521. --- apt-pkg/cdrom.cc | 7 +++++++ debian/changelog | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'apt-pkg/cdrom.cc') diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index afb067559..0cbdc178f 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -564,6 +564,13 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) Database.Find("CD::"+ident).c_str()); log->Update(msg.str()); } + + // Unmount and finish + if (_config->FindB("APT::CDROM::NoMount",false) == false) { + log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST); + UnmountCdrom(CDROM); + } + return true; } diff --git a/debian/changelog b/debian/changelog index 36c7aa2c2..70cfd48aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,10 @@ apt (0.7.9) UNRELEASED; urgency=low * Applied patch from Brian M. Carlson to add backward support for arches that lacks pselect support, closes: #448406. + * Umount CD-ROM when calling apt-cdrom ident, except when called with + -m, closes: #448521. - -- Otavio Salvador Mon, 29 Oct 2007 15:53:32 -0200 + -- Otavio Salvador Mon, 29 Oct 2007 18:26:27 -0200 apt (0.7.8) unstable; urgency=low -- cgit v1.2.3-70-g09d2