summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-01-26 21:23:30 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-01-26 21:23:30 +0100
commit6e97e817f1082bc98a8f8bf4830d4e3a3bebfb61 (patch)
tree3c549f514b813f3433288ddaf6541660347bf1e6 /cmdline
parent25ee65dd5155fda6dd3754d091b86acb5d7bd9dc (diff)
parentffee221b8d1df28768d30762d72a11289ae747dc (diff)
merged the latest lp:~mvo/apt/libudev-cdrom branch
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/apt-cdrom.cc70
1 files changed, 67 insertions, 3 deletions
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index d804c55e5..988a58f20 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -98,6 +98,42 @@ OpProgress* pkgCdromTextStatus::GetOpProgress()
return &Progress;
};
/*}}}*/
+// SetupAutoDetect /*{{{*/
+bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i)
+{
+ bool Debug = _config->FindB("Debug::Acquire::cdrom", false);
+
+ vector<struct CdromDevice> v = UdevCdroms.Scan();
+ if (i >= v.size())
+ return false;
+
+ if (Debug)
+ clog << "Looking at devce " << i
+ << " DeviveName: " << v[i].DeviceName
+ << " IsMounted: '" << v[i].Mounted << "'"
+ << " MountPoint: '" << v[i].MountPath << "'"
+ << endl;
+
+ if (v[i].Mounted)
+ {
+ // set the right options
+ _config->Set("Acquire::cdrom::mount", v[i].MountPath);
+ _config->Set("APT::CDROM::NoMount", true);
+ } else {
+ string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
+ if (!FileExists(AptMountPoint))
+ mkdir(AptMountPoint.c_str(), 0750);
+ if(MountCdrom(AptMountPoint, v[i].DeviceName) == false)
+ _error->Warning(_("Failed to mount '%s' to '%s'"), v[i].DeviceName.c_str(), AptMountPoint.c_str());
+ _config->Set("Acquire::cdrom::mount", AptMountPoint);
+ _config->Set("APT::CDROM::NoMount", true);
+ }
+ i++;
+
+ return true;
+}
+ /*}}}*/
+
// DoAdd - Add a new CDROM /*{{{*/
// ---------------------------------------------------------------------
/* This does the main add bit.. We show some status and things. The
@@ -106,12 +142,25 @@ OpProgress* pkgCdromTextStatus::GetOpProgress()
verify them. Then rewrite the database files */
bool DoAdd(CommandLine &)
{
- bool res = false;
+ pkgUdevCdromDevices UdevCdroms;
pkgCdromTextStatus log;
pkgCdrom cdrom;
- res = cdrom.Add(&log);
+ bool res = true;
+
+ bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
+ unsigned int count = 0;
+
+ if (AutoDetect && UdevCdroms.Dlopen())
+ {
+ while (AutoDetectCdrom(UdevCdroms, count))
+ res &= cdrom.Add(&log);
+ } else {
+ res = cdrom.Add(&log);
+ }
+
if(res)
cout << _("Repeat this process for the rest of the CDs in your set.") << endl;
+
return res;
}
/*}}}*/
@@ -120,10 +169,24 @@ bool DoAdd(CommandLine &)
/* */
bool DoIdent(CommandLine &)
{
+ pkgUdevCdromDevices UdevCdroms;
string ident;
pkgCdromTextStatus log;
pkgCdrom cdrom;
- return cdrom.Ident(ident, &log);
+ bool res = true;
+
+ bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
+ unsigned int count = 0;
+
+ if (AutoDetect && UdevCdroms.Dlopen())
+ {
+ while (AutoDetectCdrom(UdevCdroms, count))
+ res &= cdrom.Ident(ident, &log);
+ } else {
+ return cdrom.Ident(ident, &log);
+ }
+
+ return res;
}
/*}}}*/
// ShowHelp - Show the help screen /*{{{*/
@@ -164,6 +227,7 @@ int main(int argc,const char *argv[]) /*{{{*/
{
CommandLine::Args Args[] = {
{'h',"help","help",0},
+ {'a',"auto-detect","Acquire::cdrom::AutoDetect",0},
{'v',"version","version",0},
{'d',"cdrom","Acquire::cdrom::mount",CommandLine::HasArg},
{'r',"rename","APT::CDROM::Rename",0},