Browse Source

* merged from apt--cdrom-fallback--0

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-110

 * michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--patch-1
   * initial patch to make falling back from cdrom possible

 * michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--patch-2
   * fix in methods/cdrom.cc: don't call Fail() but return false so that apt can fallback to a differencent source
debian/1.8.y
Michael Vogt 17 years ago
parent
commit
2a7497704e
  1. 2
      apt-pkg/acquire-method.cc
  2. 14
      cmdline/acqprogress.cc
  3. 3
      methods/cdrom.cc

2
apt-pkg/acquire-method.cc

@ -277,7 +277,7 @@ bool pkgAcqMethod::MediaFail(string Required,string Drive)
MyMessages.erase(MyMessages.begin());
}
return !StringToBool(LookupTag(Message,"Fail"),false);
return !StringToBool(LookupTag(Message,"Failed"),false);
}
Messages.push_back(Message);

14
cmdline/acqprogress.cc

@ -274,10 +274,16 @@ bool AcqTextStatus::MediaChange(string Media,string Drive)
Media.c_str(),Drive.c_str());
char C = 0;
bool bStatus = true;
while (C != '\n' && C != '\r')
read(STDIN_FILENO,&C,1);
Update = true;
return true;
{
int len = read(STDIN_FILENO,&C,1);
if(C == 'c' || len <= 0)
bStatus = false;
}
if(bStatus)
Update = true;
return bStatus;
}
/*}}}*/

3
methods/cdrom.cc

@ -166,8 +166,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
if (MediaFail(Get.Host,CDROM) == false)
{
CurrentID = "FAIL";
Fail(_("Wrong CD-ROM"),true);
return true;
return _error->Error(_("Disk not found."));
}
}

Loading…
Cancel
Save