summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-11-27 22:22:21 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2015-11-27 22:22:21 +0100
commit0300f0077af832e87beb290f26b13404cab81fd3 (patch)
tree254766321928e4a91e6755e27a48e7bb441d3b59 /apt-pkg
parente006a7a1ae9fc9aeee4f83ccd05de653f6f06b60 (diff)
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
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/cdrom.cc6
1 files changed, 3 insertions, 3 deletions
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.