darktemplar/apt
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Apply apt-0.5.15cnc6-alt-apt-shell-dl.patch

Browse Source 
Added in commit a8de0fe:
0.5.15cnc6-alt13

- apt-shell: possible fix of #4707 (rider@)
This commit is contained in:
Gleb Fotengauer-Malinovskiy 2014-05-16 21:04:21 +04:00
parent face4b472c
commit 1d9742a687
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apt-0.5.15cnc6-alt-apt-shell-dl.patch
View File

@ -1,25 +0,0 @@
--- apt-0.5.15cnc6/cmdline/apt-shell.cc..segfault 2005-06-16 15:11:44 +0400
+++ apt-0.5.15cnc6/cmdline/apt-shell.cc 2005-06-16 15:17:59 +0400
@@ -145,8 +145,11 @@
{
if (Guarded) {
delete *Cache;
+ if (_error->PendingError())
+ _error->PushState();
*Cache = new CacheFile;
(*Cache)->Open();
+ _error->PopState();
if ((*Cache)->CheckDeps(true) == false) {
c1out << _("There are broken packages. ")
<< _("Run `check' to see them.") << endl;
@@ -4058,7 +4061,9 @@
_error->Error(_("You have no permissions for that"));
return false;
}
- return InstallPackages(*GCache,false);
+ int err = InstallPackages(*GCache,false);
+ _config->Set("APT::Get::Fix-Broken",false);
+ return err;
}
bool DoStatus(CommandLine &CmdL)

7
apt/cmdline/apt-shell.cc
View File

@ -145,8 +145,11 @@ class AutoReOpenCache
{
if (Guarded) {
delete *Cache;
if (_error->PendingError())
_error->PushState();
*Cache = new CacheFile;
(*Cache)->Open();
_error->PopState();
if ((*Cache)->CheckDeps(true) == false) {
c1out << _("There are broken packages. ")
<< _("Run `check' to see them.") << endl;
@ -4080,7 +4083,9 @@ bool DoCommit(CommandLine &CmdL)
_error->Error(_("You have no permissions for that"));
return false;
}
return InstallPackages(*GCache,false);
int err = InstallPackages(*GCache,false);
_config->Set("APT::Get::Fix-Broken",false);
return err;
}
bool DoStatus(CommandLine &CmdL)