From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 26 Jan 2010 13:09:24 +0000 (+0100)
Subject: merged from the lp:~mvo/apt/mvo branch
X-Git-Tag: 0.7.25.3ubuntu1~8
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/6571bee2e2289b3a183ae3a922551eb743839392?hp=972c339a1b05671e3f01b46cece3b323a2a94d61

merged from the lp:~mvo/apt/mvo branch
---

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();