From ff76c345739ea297b3811ef22d370e367f56a2bc Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Tue, 28 Jun 2016 22:04:05 +0530 Subject: [PATCH] Revert "Hotfix for autocloud" This reverts commit 79da571b0a1189224daba2a5b8258da95ededa2f. --- files/hotfix/autocloud/autocloud_job.py | 7 ++++--- files/hotfix/autocloud/consumer.py | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/files/hotfix/autocloud/autocloud_job.py b/files/hotfix/autocloud/autocloud_job.py index 54308df8e9..3acf0a619c 100644 --- a/files/hotfix/autocloud/autocloud_job.py +++ b/files/hotfix/autocloud/autocloud_job.py @@ -4,11 +4,11 @@ import datetime import json import os import subprocess +import sys from collections import defaultdict -import fedfind -import fedfind.helpers +import fedfind.release from retask.queue import Queue @@ -279,7 +279,8 @@ def check_status_of_compose_image(compose_id): session.commit() compose_id = compose_obj.compose_id - (release, _, _, _) = fedfind.helpers.parse_cid(compose_id) + rel = fedfind.release.get_release(cid=compose_id) + release = rel.release params = { 'compose_id': compose_obj.compose_id, diff --git a/files/hotfix/autocloud/consumer.py b/files/hotfix/autocloud/consumer.py index a9ef4aac80..33db5205b2 100644 --- a/files/hotfix/autocloud/consumer.py +++ b/files/hotfix/autocloud/consumer.py @@ -3,8 +3,7 @@ from datetime import datetime import requests import fedmsg.consumers -import fedfind -import fedfind.helpers +import fedfind.release from sqlalchemy import exc @@ -73,7 +72,8 @@ class AutoCloudConsumer(fedmsg.consumers.FedmsgConsumer): ) compose_id = compose_details['id'] - (release, _, _, _) = fedfind.helpers.parse_cid(compose_id) + rel = fedfind.release.get_release(cid=compose_id) + release = rel.release compose_details.update({'release': release})