From 33d96860e500d5997f962eb6da90e8b24ac5ae58 Mon Sep 17 00:00:00 2001
From: Tomas Orsava <torsava@redhat.com>
Date: Thu, 23 Feb 2017 12:16:46 +0100
Subject: [PATCH] Customize the sudo pip warning with the proper version of the
 pip

---
 ...ng-when-running-with-root-privileges.patch | 26 +++++++++++++------
 python-pip.spec                               |  6 ++++-
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/emit-a-warning-when-running-with-root-privileges.patch b/emit-a-warning-when-running-with-root-privileges.patch
index ecc2df5..5ad98e4 100644
--- a/emit-a-warning-when-running-with-root-privileges.patch
+++ b/emit-a-warning-when-running-with-root-privileges.patch
@@ -1,25 +1,35 @@
-From 5023ea0feceb5a9cc4931f6be9404d4582cb8502 Mon Sep 17 00:00:00 2001
+From e29dfc3855813dbab25513ca82703fc5d7b989cf Mon Sep 17 00:00:00 2001
 From: Tomas Orsava <torsava@redhat.com>
 Date: Tue, 14 Feb 2017 17:10:09 +0100
 Subject: [PATCH] Emit a warning when running with root privileges
 
 ---
- pip/commands/install.py | 7 +++++++
- 1 file changed, 7 insertions(+)
+ pip/commands/install.py | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
 
-diff --git a/pip/commands/install.py b/pip/commands/install.py
-index b7e662bd..c1bcf3b5 100644
+diff --git a/commands/install.py b/commands/install.py
+index 227c526..88c7c58 100644
 --- a/pip/commands/install.py
 +++ b/pip/commands/install.py
-@@ -192,6 +192,13 @@ class InstallCommand(RequirementCommand):
+@@ -6,6 +6,8 @@ import os
+ import tempfile
+ import shutil
+ import warnings
++import sys
++from os import path
+ try:
+     import wheel
+ except ImportError:
+@@ -193,6 +195,14 @@ class InstallCommand(RequirementCommand):
          cmdoptions.resolve_wheel_no_use_binary(options)
          cmdoptions.check_install_build_global(options)
  
 +        # Check whether we have root privileges
 +        if os.getuid() == 0:
 +            logger.warning(
-+                "WARNING: Running pip install with root privileges is "
-+                "generally not advised. Try `pip install --user` instead."
++                "WARNING: Running pip install with root privileges is"
++                "generally not a good idea. Try `%s install --user` instead."
++                        % path.basename(sys.argv[0])
 +            )
 +
          if options.as_egg:
diff --git a/python-pip.spec b/python-pip.spec
index e58c6f3..c5b0bac 100644
--- a/python-pip.spec
+++ b/python-pip.spec
@@ -17,7 +17,7 @@
 
 Name:           python-%{srcname}
 Version:        9.0.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A tool for installing and managing Python packages
 
 Group:          Development/Libraries
@@ -244,6 +244,10 @@ py.test-%{python3_version} -m 'not network'
 %endif # with_python3
 
 %changelog
+* Thu Feb 23 2017 Tomas Orsava <torsava@redhat.com> - 9.0.1-7
+- Patch 1 update: Customize the warning with the proper version of the pip
+  command
+
 * Tue Feb 14 2017 Tomas Orsava <torsava@redhat.com> - 9.0.1-6
 - Added patch 1: Emit a warning when running with root privileges