summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-01-26 20:36:13 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-01-26 20:36:13 +0100
commitfb503892e3e05132bb7db369440402ff81ea5f8d (patch)
tree40b4217529f797086bfef402431eb9397ec0553e /cmdline
parent169413dcf101ca39aebc2bf46991c27c1e439259 (diff)
* cmdline/apt-cdrom.cc:
- fixed signed/unsigned warning - create /media mount point if needed - fix initialization for res in DoAdd() * methods/cdrom.cc: - make AptMountPoint a variable
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/apt-cdrom.cc17
1 files changed, 10 insertions, 7 deletions
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index fc949ce7b..494a7d8df 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -99,7 +99,7 @@ OpProgress* pkgCdromTextStatus::GetOpProgress()
};
/*}}}*/
// SetupAutoDetect /*{{{*/
-bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, int &i)
+bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i)
{
bool Debug = _config->FindB("Debug::Acquire::cdrom", false);
@@ -120,9 +120,12 @@ bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, int &i)
_config->Set("Acquire::cdrom::mount", v[i].MountPath);
_config->Set("APT::CDROM::NoMount", true);
} else {
- MountCdrom("/var/lib/apt/media", v[i].DeviceName);
- MountCdrom("/var/lib/apt/media", v[i].DeviceName);
- _config->Set("Acquire::cdrom::mount", "/var/lib/apt/media");
+ const char* AptMountPoint = "/media/apt";
+ if (!FileExists(AptMountPoint))
+ mkdir(AptMountPoint, 0750);
+ if(MountCdrom(AptMountPoint, v[i].DeviceName) == false)
+ _error->Warning(_("Failed to mount '%s' to '%s'"), v[i].DeviceName.c_str(), AptMountPoint);
+ _config->Set("Acquire::cdrom::mount", AptMountPoint);
_config->Set("APT::CDROM::NoMount", true);
}
i++;
@@ -142,10 +145,10 @@ bool DoAdd(CommandLine &)
pkgUdevCdromDevices UdevCdroms;
pkgCdromTextStatus log;
pkgCdrom cdrom;
- bool res = false;
+ bool res = true;
bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
- int count = 0;
+ unsigned int count = 0;
if (AutoDetect && UdevCdroms.Dlopen())
{
@@ -173,7 +176,7 @@ bool DoIdent(CommandLine &)
bool res = true;
bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
- int count = 0;
+ unsigned int count = 0;
if (AutoDetect && UdevCdroms.Dlopen())
{