[yum-commits] yum/__init__.py

[zpavlas at osuosl.org]

 yum/__init__.py |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit f60afc4be5ead94ff3b739e4caa1eb322e14b81d
Author: Zdeněk Pavlas <zpavlas at redhat.com>
Date:   Wed May 9 13:22:55 2012 +0200

    Fix the 'yum provides ""' case.  BZ 817491.

diff --git a/yum/__init__.py b/yum/__init__.py
index 8eea31e..8f20efa 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -3051,14 +3051,7 @@ class YumBase(depsolve.Depsolve):
         def _arg_data(arg):
             if not misc.re_glob(arg):
                 isglob = False
-<<<<<<< HEAD
-                if not arg or arg[0] != '/':
-                    canBeFile = False
-                else:
-                    canBeFile = True
-=======
                 canBeFile = arg.startswith('/')
->>>>>>> Fix the 'yum provides ""' case.  BZ 817491.
             else:
                 isglob = True
                 canBeFile = misc.re_filename(arg)