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

Apply apt-0.5.15cnc5-alt-execrpm-cmd.patch

Browse Source 
Added in commit e97a90d:
0.5.15lorg2-alt3

- Resolved a few issues introduced after cnc6.
This commit is contained in:
Gleb Fotengauer-Malinovskiy 2014-05-16 21:04:20 +04:00
parent a2750a7a83
commit 9c683e8cd3
2 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
apt-0.5.15cnc5-alt-execrpm-cmd.patch
View File

@ -1,31 +0,0 @@
2004-01-16 Dmitry V. Levin <ldv@altlinux.org>
* apt-pkg/rpm/rpmpm.cc(pkgRPMPM::ExecRPM):
Report actual options being passed to rpm.
--- apt-0.5.15cnc5/apt-pkg/rpm/rpmpm.cc.orig 2004-01-16 14:55:17 +0300
+++ apt-0.5.15cnc5/apt-pkg/rpm/rpmpm.cc 2004-01-16 14:56:02 +0300
@@ -497,6 +497,14 @@ bool pkgRPMExtPM::ExecRPM(Item::RPMOps o
if (_config->FindB("RPM::Order",false) == false)
Args[n++] = "--noorder";
+
+ string cmd;
+ for (unsigned i = 0; i < n; ++i)
+ {
+ if (!cmd.empty())
+ cmd += ' ';
+ cmd += Args[i];
+ }
bool FilesInArgs = true;
char *ArgsFileName = NULL;
@@ -542,7 +550,7 @@ bool pkgRPMExtPM::ExecRPM(Item::RPMOps o
return true;
}
- cout << _("Executing RPM (")<<operation<<")..." << endl;
+ cout << _("Executing RPM (")<<cmd<<")..." << endl;
cout << flush;
clog << flush;

10
apt/apt-pkg/rpm/rpmpm.cc
View File

@ -516,6 +516,14 @@ bool pkgRPMExtPM::ExecRPM(Item::RPMOps op, vector<const char*> &files)
if (_config->FindB("RPM::Order", false) == false)
Args[n++] = "--noorder";
string cmd;
for (unsigned i = 0; i < n; ++i)
{
if (!cmd.empty())
cmd += ' ';
cmd += Args[i];
}
bool FilesInArgs = true;
char *ArgsFileName = NULL;
#if RPM_VERSION >= 0x040000
@ -560,7 +568,7 @@ bool pkgRPMExtPM::ExecRPM(Item::RPMOps op, vector<const char*> &files)
return true;
}
cout << _("Executing RPM (")<<operation<<")..." << endl;
cout << _("Executing RPM (")<<cmd<<")..." << endl;
cout << flush;
clog << flush;