From 9c683e8cd3c5f53e1946f2f6ef900cb6ce8fa475 Mon Sep 17 00:00:00 2001
From: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
Date: Fri, 16 May 2014 21:04:20 +0400
Subject: [PATCH] Apply apt-0.5.15cnc5-alt-execrpm-cmd.patch

Added in commit e97a90d:
0.5.15lorg2-alt3

- Resolved a few issues introduced after cnc6.
---
 apt-0.5.15cnc5-alt-execrpm-cmd.patch | 31 ----------------------------
 apt/apt-pkg/rpm/rpmpm.cc             | 10 ++++++++-
 2 files changed, 9 insertions(+), 32 deletions(-)
 delete mode 100644 apt-0.5.15cnc5-alt-execrpm-cmd.patch

diff --git a/apt-0.5.15cnc5-alt-execrpm-cmd.patch b/apt-0.5.15cnc5-alt-execrpm-cmd.patch
deleted file mode 100644
index 813638a..0000000
--- a/apt-0.5.15cnc5-alt-execrpm-cmd.patch
+++ /dev/null
@@ -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;
diff --git a/apt/apt-pkg/rpm/rpmpm.cc b/apt/apt-pkg/rpm/rpmpm.cc
index 1ec9bc9..f2bd999 100644
--- a/apt/apt-pkg/rpm/rpmpm.cc
+++ b/apt/apt-pkg/rpm/rpmpm.cc
@@ -515,6 +515,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;
@@ -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;