From 0300f0077af832e87beb290f26b13404cab81fd3 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Fri, 27 Nov 2015 22:22:21 +0100
Subject: outsmart gcc -O3 over-optimization in pkgCdrom::FindPackages

Seems like a simpler workaround than forcing a lower optimization
level just for this for all of apt.

See also:
https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1473674
---
 apt-pkg/cdrom.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'apt-pkg/cdrom.cc')

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 29eeca066..5613459e7 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -61,10 +61,10 @@ bool pkgCdrom::FindPackages(string CD,
       return _error->Errno("chdir","Unable to change to %s",CD.c_str());
 
    // Look for a .disk subdirectory
-   if (DirectoryExists(".disk") == true)
+   if (InfoDir.empty() == true)
    {
-      if (InfoDir.empty() == true)
-	 InfoDir = CD + ".disk/";
+      if (DirectoryExists(".disk") == true)
+	 InfoDir = InfoDir + CD + ".disk/";
    }
 
    // Don't look into directories that have been marked to ingore.
-- 
cgit v1.2.3