From 67e3947a9b018839140f58b986d685c1ea631411 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Wed, 15 Feb 2017 19:42:36 -0500
Subject: [PATCH 1/4] Handle changing PDCClient API.

I hit this in staging.  Some versions of the pdc-client library have a
different signature for PDCClient.  We need to specify these as keyword
arguments so we don't get spooky failures with accidental values.
---
 module_build_service/pdc.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/module_build_service/pdc.py b/module_build_service/pdc.py
index 4d7142b9..2dd9e5ab 100644
--- a/module_build_service/pdc.py
+++ b/module_build_service/pdc.py
@@ -41,7 +41,11 @@ def get_pdc_client_session(config):
     :param config: instance of module_build_service.config.Config
     :return pdc_client.PDCClient instance
     """
-    return PDCClient(config.pdc_url, config.pdc_develop, config.pdc_insecure) # hardcoded devel env
+    return PDCClient(
+        server=config.pdc_url,
+        develop=config.pdc_develop,
+        insecure=config.pdc_insecure,
+    )
 
 def get_variant_dict(data):
     """

From b37ff407588bd3b0e8a1d27c1dfb453999243ee1 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Thu, 16 Feb 2017 10:30:02 -0500
Subject: [PATCH 2/4] Handle still more variations in the pdcclient api.

---
 module_build_service/pdc.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/module_build_service/pdc.py b/module_build_service/pdc.py
index 2dd9e5ab..efc79229 100644
--- a/module_build_service/pdc.py
+++ b/module_build_service/pdc.py
@@ -28,6 +28,7 @@
 import modulemd
 from pdc_client import PDCClient
 
+import inspect
 import pprint
 import logging
 log = logging.getLogger()
@@ -41,11 +42,20 @@ def get_pdc_client_session(config):
     :param config: instance of module_build_service.config.Config
     :return pdc_client.PDCClient instance
     """
-    return PDCClient(
-        server=config.pdc_url,
-        develop=config.pdc_develop,
-        insecure=config.pdc_insecure,
-    )
+    if 'ssl_verify' in inspect.getargspec(PDCClient.__init__).args:
+        # New API
+        return PDCClient(
+            server=config.pdc_url,
+            develop=config.pdc_develop,
+            ssl_verify=not config.pdc_insecure,
+        )
+    else:
+        # New API
+        return PDCClient(
+            server=config.pdc_url,
+            develop=config.pdc_develop,
+            insecure=config.pdc_insecure,
+        )
 
 def get_variant_dict(data):
     """

From 2819b652042ee48a2069c02b8580f81cc61d4326 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Thu, 16 Feb 2017 10:30:08 -0500
Subject: [PATCH 3/4] Remove unused import.

---
 module_build_service/pdc.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module_build_service/pdc.py b/module_build_service/pdc.py
index efc79229..75eb52d9 100644
--- a/module_build_service/pdc.py
+++ b/module_build_service/pdc.py
@@ -34,7 +34,6 @@ import logging
 log = logging.getLogger()
 
 import six
-import module_build_service
 
 
 def get_pdc_client_session(config):

From bebf50f78c632913a714e6b442fc8b6f2bc45d47 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Thu, 16 Feb 2017 10:41:40 -0500
Subject: [PATCH 4/4] Haste makes waste.

---
 module_build_service/pdc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module_build_service/pdc.py b/module_build_service/pdc.py
index 75eb52d9..654aab2b 100644
--- a/module_build_service/pdc.py
+++ b/module_build_service/pdc.py
@@ -49,7 +49,7 @@ def get_pdc_client_session(config):
             ssl_verify=not config.pdc_insecure,
         )
     else:
-        # New API
+        # Old API
         return PDCClient(
             server=config.pdc_url,
             develop=config.pdc_develop,