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

0.5.15cnc6-alt13

Browse Source 
- apt-shell: possible fix of #4707 (rider@)
This commit is contained in:
Sergey Bolshakov 2005-06-16 11:25:49 +00:00 committed by Dmitry V. Levin
parent 422369f2c0
commit a8de0fe5ed
2 changed files with 33 additions and 3 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 Normal file
View File

@ -0,0 +1,25 @@
--- 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)

11
apt.spec
View File

@ -1,8 +1,8 @@
# $Id: apt,v 1.14 2005/05/31 09:04:36 me Exp $
# $Id: apt,v 1.16 2005/06/16 11:19:22 me Exp $
Name: apt
Version: 0.5.15cnc6
Release: alt12
Release: alt13
Summary: Debian's Advanced Packaging Tool with RPM support
Summary(ru_RU.KOI8-R): Debian APT - õÓÏ×ÅÒÛÅÎÓÔ×Ï×ÁÎÎÏÅ ÓÒÅÄÓÔ×Ï ÕÐÒÁ×ÌÅÎÉÑ ÐÁËÅÔÁÍÉ Ó ÐÏÄÄÅÒÖËÏÊ RPM
@ -47,7 +47,8 @@ Patch33: apt-0.5.15cnc6-alt-apt-shell.patch
Patch34: apt-0.5.15cnc6-alt-umount.patch
Patch35: apt-0.5.15cnc6-alt-apt-get-TryToInstall.patch
Patch36: apt-0.5.15cnc6-alt-lsgroup.patch
Patch37: apt-0.5.15cnc6-alt-apt-pipe.patch
Patch37: apt-0.5.15cnc6-alt-apt-shell-dl.patch
Patch38: apt-0.5.15cnc6-alt-apt-pipe.patch
# Normally not applied, but useful.
Patch101: apt-0.5.4cnc9-alt-getsrc-debug.patch
@ -237,6 +238,7 @@ This package contains method 'rsync' for APT.
%patch35 -p1
%patch36 -p1
%patch37 -p1
%patch38 -p1
find -type f -name \*.orig -delete -print
@ -352,6 +354,9 @@ fi
# Probably %%doc with README.rsync?
%changelog
* Thu Jun 16 2005 Sergey Bolshakov <sbolshakov@altlinux.ru> 0.5.15cnc6-alt13
- apt-shell: possible fix of #4707 (rider@)
* Tue May 31 2005 Sergey Bolshakov <sbolshakov@altlinux.ru> 0.5.15cnc6-alt12
- apt-pipe: inactivity timeout removed
- apt-pipe: do not copy packages from cdrom during install