current/SOURCES/waagent-pyasn1.patch

Index: WALinuxAgent-1.2/waagent
===================================================================
--- WALinuxAgent-1.2.orig/waagent
+++ WALinuxAgent-1.2/waagent
@@ -2229,8 +2229,9 @@ def Install():
             Error(GuestAgentLongName + " is not compatible with NetworkManager.")
             return 1
         if Run("rpm --quiet -q python-pyasn1"):
-            Error(GuestAgentLongName + " requires python-pyasn1.")
-            return 1
+           if Run("rpm --quiet -q pyasn1"):
+                Error(GuestAgentLongName + " requires python-pyasn1.")
+                return 1
     if UsesDpkg() and not Run("dpkg-query -s network-manager >/dev/null 2>&1"):
         Error(GuestAgentLongName + " is not compatible with network-manager.")
         return 1
1	dams	343730	Index: WALinuxAgent-1.2/waagent
2			===================================================================
3			--- WALinuxAgent-1.2.orig/waagent
4			+++ WALinuxAgent-1.2/waagent
5			@@ -2229,8 +2229,9 @@ def Install():
6			Error(GuestAgentLongName + " is not compatible with NetworkManager.")
7			return 1
8			if Run("rpm --quiet -q python-pyasn1"):
9			- Error(GuestAgentLongName + " requires python-pyasn1.")
10			- return 1
11			+ if Run("rpm --quiet -q pyasn1"):
12			+ Error(GuestAgentLongName + " requires python-pyasn1.")
13			+ return 1
14			if UsesDpkg() and not Run("dpkg-query -s network-manager >/dev/null 2>&1"):
15			Error(GuestAgentLongName + " is not compatible with network-manager.")
16			return 1