diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-01-26 14:09:24 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-01-26 14:09:24 +0100 |
| commit | 6571bee2e2289b3a183ae3a922551eb743839392 (patch) | |
| tree | 12e12b1875d0605bcd71ced3052a5a31dcb07029 | |
| parent | 972c339a1b05671e3f01b46cece3b323a2a94d61 (diff) | |
| parent | c1f168f54be5b4babeb9b91cd7145441ea2489ad (diff) | |
| download | apt-6571bee2e2289b3a183ae3a922551eb743839392.tar.gz | |
merged from the lp:~mvo/apt/mvo branch
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | methods/cdrom.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 13fd4471d..dccdda64f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ apt (0.7.25ubuntu3) UNRELEASED; urgency=low - add new "Acquire::cdrom::AutoDetect" variable that enables/disables the dlopen of libudev for automatic cdrom detection - -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 18 Dec 2009 16:54:18 +0100 + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 26 Jan 2010 12:01:36 +0100 apt (0.7.25ubuntu2) lucid; urgency=low diff --git a/methods/cdrom.cc b/methods/cdrom.cc index 87794b052..0e78851ff 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -92,7 +92,7 @@ string CDROMMethod::GetID(string Name) // CDROMMethod::AutoDetectAndMount /*{{{*/ // --------------------------------------------------------------------- /* Modifies class varaiable CDROM to the mountpoint */ -bool CDROMMethod::AutoDetectAndMount(URI Get, string NewID) +bool CDROMMethod::AutoDetectAndMount(URI Get, string &NewID) { vector<struct CdromDevice> v = UdevCdroms.Scan(); |