diff --git a/aptly_cli/api/api.py b/aptly_cli/api/api.py index f745081..911a035 100644 --- a/aptly_cli/api/api.py +++ b/aptly_cli/api/api.py @@ -9,7 +9,10 @@ import json import requests import os -from ConfigParser import ConfigParser +try: + from ConfigParser import ConfigParser +except ImportError: + from configparser import ConfigParser class AptlyApiRequests(object): @@ -33,7 +36,7 @@ def __init__(self): else: basic_url = 'http://localhost' port = ':9003' - print "No Config file found, take default values" + print("No Config file found, take default values") self.headers = {'content-type': 'application/json'} @@ -63,7 +66,7 @@ def _out(arg_list): Will give beautified output of a list. """ for y in arg_list: - print json.dumps(y, indent=2) + print(json.dumps(y, indent=2)) @staticmethod def get_config_from_file(): @@ -129,7 +132,7 @@ def repo_create(self, repo_name, data=None): headers=self.headers) # r.raise_for_status() resp_data = json.loads(r.content) - # print resp_data + # print(resp_data) return resp_data def repo_show(self, repo_name): @@ -153,7 +156,7 @@ def repo_show(self, repo_name): """ r = requests.get(self.cfg['route_repo'] + repo_name, headers=self.headers) resp_data = json.loads(r.content) - # print resp_data + # print(resp_data) return resp_data def repo_show_packages(self, repo_name, pkg_to_search=None, with_deps=0, detail='compact'): @@ -187,7 +190,7 @@ def repo_show_packages(self, repo_name, pkg_to_search=None, with_deps=0, detail= r = requests.get(url, params=param, headers=self.headers) # raise_for_status() resp_data = json.loads(r.content) - # print json.dumps(resp_data) + # print(json.dumps(resp_data)) return resp_data def repo_edit(self, repo_name, data=None): @@ -226,7 +229,7 @@ def repo_edit(self, repo_name, data=None): headers=self.headers) # r.raise_for_status() resp_data = json.loads(r.content) - # print resp_data + # print(resp_data) return resp_data def repo_list(self): @@ -241,7 +244,7 @@ def repo_list(self): r = requests.get(self.cfg['route_repo'], headers=self.headers) # r.raise_for_status() resp_data = json.loads(r.content) - # print json.dumps(resp_data) + # print(json.dumps(resp_data)) return resp_data def repo_delete(self, repo_name): @@ -264,7 +267,7 @@ def repo_delete(self, repo_name): headers=self.headers) # r.raise_for_status() resp_data = json.loads(r.content) - # print json.dumps(resp_data) + # print(json.dumps(resp_data)) return resp_data def repo_add_package_from_upload(self, repo_name, dir_name, file_name=None, params=None): @@ -319,7 +322,7 @@ def repo_add_package_from_upload(self, repo_name, dir_name, file_name=None, para headers=self.headers) # r.raise_for_status() resp_data = json.loads(r.content) - # print resp_data + # print(resp_data) return resp_data def repo_add_packages_by_key(self, repo_name, package_key_list): @@ -348,7 +351,7 @@ def repo_add_packages_by_key(self, repo_name, package_key_list): http://localhost:8080/api/repos/repo2/packages """ if len(package_key_list) <= 0: - print 'No packages were given... aborting' + print('No packages were given... aborting') return url = self.cfg['route_repo'] + repo_name + '/packages' @@ -357,7 +360,7 @@ def repo_add_packages_by_key(self, repo_name, package_key_list): } r = requests.post(url, data=json.dumps(param), headers=self.headers) resp_data = json.loads(r.content) - # print resp_data + # print(resp_data) return resp_data def repo_delete_packages_by_key(self, repo_name, package_key_list): @@ -386,7 +389,7 @@ def repo_delete_packages_by_key(self, repo_name, package_key_list): } r = requests.delete(url, data=json.dumps(data), headers=self.headers) resp_data = json.loads(r.content) - # print resp_data + # print(resp_data) return resp_data ################### @@ -406,7 +409,7 @@ def file_list_directories(self): r = requests.get(self.cfg['route_file'], headers=self.headers) # r.raise_for_status() resp_data = json.loads(r.content) - # print json.dumps(resp_data) + # print(json.dumps(resp_data)) return resp_data def file_upload(self, dir_name, file_path): @@ -431,7 +434,7 @@ def file_upload(self, dir_name, file_path): # r.raise_for_status() resp_data = json.loads(r.content) - # print resp_data + # print(resp_data) return resp_data def file_list(self, dir_name=None): @@ -454,7 +457,7 @@ def file_list(self, dir_name=None): dir_name, headers=self.headers) # r.raise_for_status() resp_data = json.loads(r.content) - # print json.dumps(resp_data) + # print(json.dumps(resp_data)) return resp_data def file_delete_directory(self, dir_name): @@ -470,7 +473,7 @@ def file_delete_directory(self, dir_name): self.cfg['route_file'] + dir_name, headers=self.headers) # r.raise_for_status() resp_data = json.loads(r.content) - # print json.dumps(resp_data) + # print(json.dumps(resp_data)) return resp_data def file_delete(self, dir_name, file_name): @@ -486,7 +489,7 @@ def file_delete(self, dir_name, file_name): self.cfg['route_file'] + dir_name + '/' + file_name, headers=self.headers) # r.raise_for_status() resp_data = json.loads(r.content) - # print json.dumps(resp_data) + # print(json.dumps(resp_data)) return resp_data ################ @@ -546,7 +549,7 @@ def snapshot_create_from_local_repo(self, snapshot_name, repo_name, description= r = requests.post(url, data=json.dumps(data), headers=self.headers) # r.raise_for_status() resp_data = json.loads(r.content) - # print resp_data + # print(resp_data) return resp_data def snapshot_create_from_package_refs(self, snapshot_name, source_snapshot_list, package_refs_list, descr=None): @@ -586,7 +589,7 @@ def snapshot_create_from_package_refs(self, snapshot_name, source_snapshot_list, r = requests.post(url, data=json.dumps(data), headers=self.headers) resp_data = json.loads(r.content) - # print resp_data + # print(resp_data) return resp_data def snapshot_update(self, old_snapshot_name, new_snapshot_name, description=None): @@ -618,7 +621,7 @@ def snapshot_update(self, old_snapshot_name, new_snapshot_name, description=None r = requests.put(url, data=json.dumps(data), headers=self.headers) resp_data = json.loads(r.content) - # print resp_data + # print(resp_data) return resp_data def snapshot_show(self, snapshot_name): @@ -637,7 +640,7 @@ def snapshot_show(self, snapshot_name): url = self.cfg['route_snap'] + snapshot_name r = requests.get(url, headers=self.headers) resp_data = json.loads(r.content) - # print resp_data + # print(resp_data) return resp_data def snapshot_delete(self, snapshot_name, force='0'): @@ -660,16 +663,16 @@ def snapshot_delete(self, snapshot_name, force='0'): """ url = self.cfg['route_snap'] + snapshot_name if force == '1': - print 'Forcing removal of snapshot' + print('Forcing removal of snapshot') param = { 'force': force } r = requests.delete(url, params=param, headers=self.headers) - print r.url + print(r.url) resp_data = json.loads(r.content) - # print resp_data + # print(resp_data) return resp_data def snapshot_show_packages(self, snapshot_name, package_to_search=None, with_deps=0, detail='compact'): @@ -704,7 +707,7 @@ def snapshot_show_packages(self, snapshot_name, package_to_search=None, with_dep r = requests.get(url, params=param, headers=self.headers) resp_data = json.loads(r.content) - # print resp_data + # print(resp_data) return resp_data def snapshot_diff(self, snapshot_left, snapshot_right): @@ -729,7 +732,7 @@ def snapshot_diff(self, snapshot_left, snapshot_right): snapshot_left + '/diff/' + snapshot_right r = requests.get(url, headers=self.headers) resp = json.loads(r.content) - # print resp + # print(resp) return resp ############### @@ -748,7 +751,7 @@ def publish_list(self): url = self.cfg['route_pub'] r = requests.get(url, headers=self.headers) resp = json.loads(r.content) - # print resp + # print(resp) return resp def publish(self, prefix, src_kind, src_list, dist, comp_list, label=None, orig=None, overwrite=None, arch_list=None): @@ -796,7 +799,7 @@ def publish(self, prefix, src_kind, src_list, dist, comp_list, label=None, orig= # Prepare list of sources sources = [] if len(comp_list) != len(src_list): - print "ERROR: sources list and components list should have same length" + print("ERROR: sources list and components list should have same length") return for x in src_list: @@ -812,19 +815,19 @@ def publish(self, prefix, src_kind, src_list, dist, comp_list, label=None, orig= if orig is None: if overwrite is None: if arch_list is None: - print 'simple publish' + print('simple publish') dat = { 'SourceKind': src_kind, 'Sources': sources, 'Distribution': dist } else: - print 'multi publish' + print('multi publish') if int(overwrite) <= 0: fo = False else: fo = True - print fo + print(fo) dat = { 'SourceKind': src_kind, 'Sources': sources, @@ -835,11 +838,11 @@ def publish(self, prefix, src_kind, src_list, dist, comp_list, label=None, orig= 'ForceOverwrite': fo } - # print dat + # print(dat) r = requests.post(url, data=json.dumps(dat), headers=self.headers) - # print r.url + # print(r.url) resp = json.loads(r.content) - # print resp + # print(resp) return resp def publish_switch(self, prefix, snapshot_list, dist, component=None, force_overwrite=0): @@ -872,7 +875,7 @@ def publish_switch(self, prefix, snapshot_list, dist, component=None, force_over is_array = isinstance(snapshot_list, list) if not is_array: - print "convert snapshot param to array.. " + print("convert snapshot param to array.. ") tmp_val = snapshot_list snapshot_list = tmp_val.split(', ') @@ -887,14 +890,14 @@ def publish_switch(self, prefix, snapshot_list, dist, component=None, force_over 'Name': x } snap_list_obj.append(snap_obj) - print snap_list_obj + print(snap_list_obj) data = { 'Snapshots': snap_list_obj, 'ForceOverwrite': fo } r = requests.put(url, data=json.dumps(data), headers=self.headers) resp = json.loads(r.content) - # print resp + # print(resp) return resp def publish_drop(self, prefix, distribution, force=0): @@ -921,7 +924,7 @@ def publish_drop(self, prefix, distribution, force=0): r = requests.delete(url, params=param, headers=self.headers) resp = json.loads(r.content) - # print resp + # print(resp) return resp ############### @@ -953,7 +956,7 @@ def package_show_by_key(self, package_key): url = self.cfg['route_pack'] + package_key r = requests.get(url, headers=self.headers) resp = json.loads(r.content) - # print resp + # print(resp) return resp ############# @@ -970,10 +973,10 @@ def graph(self, file_ext='.png'): open url http://localhost:8080/api/graph.svg in browser (hint: aptly database should be non-empty) """ url = self.cfg['route_graph'][:-1] + file_ext - print url + print(url) r = requests.get(url, headers=self.headers) resp = json.loads(r.content) - # print resp + # print(resp) return resp ############### @@ -991,5 +994,5 @@ def get_version(self): url = self.cfg['route_vers'] r = requests.get(url, headers=self.headers) resp = json.loads(r.content) - # print resp + # print(resp) return resp diff --git a/aptly_cli/cli/cli.py b/aptly_cli/cli/cli.py index 5bf071b..ac0c2d0 100644 --- a/aptly_cli/cli/cli.py +++ b/aptly_cli/cli/cli.py @@ -26,7 +26,7 @@ def main(): home = os.path.expanduser("~") name = home + '/aptly-cli.conf' if not os.path.exists(name): - print "No config file (aptly-cli.conf) found at $HOME. Please create one by --create_config option" + print("No config file (aptly-cli.conf) found at $HOME. Please create one by --create_config option") sys.exit(0) @@ -233,7 +233,7 @@ def __init__(self): # if opts.repo_list: resp = util.api.repo_list() - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.repo_create: if len(args) >= 3: @@ -243,7 +243,7 @@ def __init__(self): resp = util.api.repo_create(opts.repo_create, Data) else: resp = util.api.repo_create(opts.repo_create) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.repo_show_packages: resp = None @@ -252,11 +252,11 @@ def __init__(self): opts.repo_show_packages, args[0], args[1], args[2]) else: resp = util.api.repo_show_packages(opts.repo_show_packages) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.repo_show: resp = util.api.repo_show(opts.repo_show) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.repo_edit: if len(args) >= 3: @@ -264,47 +264,47 @@ def __init__(self): Data.default_distribution = args[1] Data.default_component = args[2] resp = util.api.repo_edit(opts.repo_edit, Data) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) else: - print 'Wrong usage!' + print('Wrong usage!') if opts.repo_delete: resp = util.api.repo_delete(opts.repo_delete) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.file_list_dirs: resp = util.api.file_list_directories() - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.file_upload: resp = util.api.file_upload(opts.file_upload[0], opts.file_upload[1]) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.repo_add_package_from_upload: o = opts.repo_add_package_from_upload resp = util.api.repo_add_package_from_upload(o[0], o[1], o[2]) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.repo_add_packages_by_key: - print 'repo_add_packages_by_key' + print('repo_add_packages_by_key') o = opts.repo_add_packages_by_key key_list = o[1].split(', ') resp = util.api.repo_add_packages_by_key(o[0], key_list) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.repo_delete_packages_by_key: - print 'repo_delete_packages_by_key' + print('repo_delete_packages_by_key') o = opts.repo_delete_packages_by_key key_list = o[1].split(', ') resp = util.api.repo_delete_packages_by_key(o[0], key_list) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.file_list: resp = util.api.file_list() if opts.file_delete_dir: resp = util.api.file_delete_directory(opts.file_delete_dir) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.file_delete: resp = util.api.file_delete(opts.file_delete[0], opts.file_delete[1]) @@ -316,7 +316,7 @@ def __init__(self): resp = util.api.snapshot_create_from_local_repo(o[0], o[1], args[0]) else: resp = util.api.snapshot_create_from_local_repo(o[0], o[1]) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.snapshot_create_by_pack_refs: o = opts.snapshot_create_by_pack_refs @@ -326,7 +326,7 @@ def __init__(self): resp = util.api.snapshot_create_from_package_refs(o[0], o[1].split(', '), l, args[0]) else: resp = util.api.snapshot_create_from_package_refs(o[0], o[1].split(', '), l) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.snapshot_show_packages: o = opts.snapshot_show_packages @@ -335,35 +335,35 @@ def __init__(self): resp = util.api.snapshot_show_packages(o, args[0], args[1], args[2]) else: resp = util.api.snapshot_show_packages(o) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.snapshot_update: o = opts.snapshot_update if len(args) >= 1: resp = util.api.snapshot_update(o[0], o[1], args[0]) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.snapshot_list: if len(args) >= 1: - print json.dumps(util.api.snapshot_list(args[0]), indent=2) + print(json.dumps(util.api.snapshot_list(args[0]), indent=2)) else: - print json.dumps(util.api.snapshot_list(), indent=2) + print(json.dumps(util.api.snapshot_list(), indent=2)) if opts.snapshot_diff: - print json.dumps(util.api.snapshot_diff(opts.snapshot_diff[0], opts.snapshot_diff[1]), indent=2) + print(json.dumps(util.api.snapshot_diff(opts.snapshot_diff[0], opts.snapshot_diff[1]), indent=2)) if opts.snapshot_delete: resp = None if len(args) >= 1: - print args[0] + print(args[0]) resp = util.api.snapshot_delete(opts.snapshot_delete, args[0]) else: resp = util.api.snapshot_delete(opts.snapshot_delete) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.publish_list: resp = util.api.publish_list() - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.publish: o = opts.publish @@ -373,7 +373,7 @@ def __init__(self): o[0], o[1], o[2].split(', '), o[3], o[4].split(', '), args[1], args[2], args[3], args[4].split(', ')) else: resp = util.api.publish(o[0], o[1], o[2].split(', '), o[3], o[4].split(', ')) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.publish_switch: o = opts.publish_switch @@ -382,7 +382,7 @@ def __init__(self): res = util.api.publish_switch(o[0], o[1], o[2], args[0], args[1]) else: res = util.api.publish_switch(o[0], o[1], o[2]) - print json.dumps(res, indent=2) + print(json.dumps(res, indent=2)) if opts.publish_drop: o = opts.publish_drop @@ -391,15 +391,15 @@ def __init__(self): resp = util.api.publish_drop(o[0], o[1], args[0]) else: resp = util.api.publish_drop(o[0], o[1]) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.package_show_by_key: resp = util.api.package_show_by_key(opts.package_show_by_key) - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) if opts.get_version: resp = util.api.get_version() - print json.dumps(resp, indent=2) + print(json.dumps(resp, indent=2)) # # Extended functionalities @@ -416,9 +416,9 @@ def __init__(self): res = util.get_last_snapshots(o[0], o[1]) if len(res) == 1: - print ''.join(res) + print(''.join(res)) else: - print json.dumps(res, indent=2) + print(json.dumps(res, indent=2)) if opts.clean_last_snapshots: o = opts.clean_last_snapshots @@ -427,7 +427,7 @@ def __init__(self): else: res = util.clean_last_snapshots(o[0], o[1]) - print json.dumps(res, indent=2) + print(json.dumps(res, indent=2)) if opts.diff_both_last_snapshots_mirrors: # package prefix, reponame @@ -453,9 +453,9 @@ def __init__(self): res = util.get_last_packages(o[0], o[1], o[2]) if len(res) == 1: - print ''.join(res) + print(''.join(res)) else: - print json.dumps(res, indent=2) + print(json.dumps(res, indent=2)) if opts.clean_last_packages: o = opts.clean_last_packages diff --git a/aptly_cli/util/util.py b/aptly_cli/util/util.py index fb2f2c9..df471e5 100644 --- a/aptly_cli/util/util.py +++ b/aptly_cli/util/util.py @@ -37,10 +37,10 @@ def create_init_file(): home = expanduser("~") name = home + '/aptly-cli.conf' - print "Look for already existing file..." + print("Look for already existing file...") if not exists(name): - print 'Create_init_file' + print('Create_init_file') try: conf = open(name, 'a') conf.write( @@ -52,8 +52,8 @@ def create_init_file(): print('Something went wrong! Can\'t tell what?') else: - print "File already exists! Stop action" - print name + print("File already exists! Stop action") + print(name) def _natural_keys(self, text): """ _natural_keys @@ -119,8 +119,8 @@ def clean_last_snapshots(self, prefix, nr_of_vers, postfix=None): # force removal self.api.snapshot_delete(item, '1') else: - print prefix - print "Nothing to delete...." + print(prefix) + print("Nothing to delete....") def diff_both_last_snapshots_mirrors(self): """ diff_both_last_snapshots_mirrors @@ -131,7 +131,7 @@ def diff_both_last_snapshots_mirrors(self): if local_cfg['prefixes_mirrors']: prefix_list = local_cfg['prefixes_mirrors'].split(', ') else: - print "Error: Prefix list is empty: please add prefixes_mirrors to your configfile!" + print("Error: Prefix list is empty: please add prefixes_mirrors to your configfile!") snaplist = self.api.snapshot_list() results = [] @@ -149,7 +149,7 @@ def diff_both_last_snapshots_mirrors(self): else: results.append("EMPTY") - # print results + # print(results) result = "" for y in results: if y == "EMPTY": @@ -158,7 +158,7 @@ def diff_both_last_snapshots_mirrors(self): result = y break - print result + print(result) return result def list_all_repos_and_packages(self): @@ -166,10 +166,10 @@ def list_all_repos_and_packages(self): """ repos = self.api.repo_list() for repo in repos: - print repo[u'Name'] + print(repo[u'Name']) packs = self.api.repo_show_packages(repo[u'Name']) for pack in packs: - print pack + print(pack) def get_last_packages(self, repo_name, pack_prefix, nr_of_leftover, postfix=None): """ get_last_packages @@ -194,31 +194,31 @@ def clean_last_packages(self, repo_name, pack_prefix, nr_of_leftover, postfix=No nr_to_left_over = int( self.api.get_config_from_file()['save_last_pkg']) - print nr_to_left_over + print(nr_to_left_over) if len(items_to_delete) > nr_to_left_over: worklist = [] for item in items_to_delete[:-nr_to_left_over]: if item: - print "Will remove..." - print item + print("Will remove...") + print(item) worklist.append(item) self.api.repo_delete_packages_by_key(repo_name, worklist) else: - print "Nothing to delete..." + print("Nothing to delete...") def _sort_out_last_n_packages(self, packlist, prefix, nr_of_leftover, postfix=None): """ _sort_out_last_n_snap Returns n sorted items from given input list by prefix. """ - # print packlist + # print(packlist) worklist = [] for pack_blob in packlist: pack_tmp = pack_blob.split(' ') if pack_tmp[1] in prefix: worklist.append(pack_blob) - # print pack_tmp[1] + # print(pack_tmp[1]) slen = len(worklist) worklist.sort(key=self._natural_keys) @@ -236,12 +236,12 @@ def clean_mirrored_snapshots(self): """ clean_mirrored_snapshots Clean out all snapshots that were taken from mirrors. The mirror entries are taken from config file. """ - print "clean mirrored snapshots" + print("clean mirrored snapshots") local_cfg = self.api.get_config_from_file() if local_cfg['prefixes_mirrors']: prefix_list = local_cfg['prefixes_mirrors'].split(', ') else: - print "Error: Prefix list is empty: please add prefixes_mirrors to your configfile!" + print("Error: Prefix list is empty: please add prefixes_mirrors to your configfile!") for x in prefix_list: self.clean_last_snapshots(x, 100) @@ -250,41 +250,41 @@ def clean_repo_packages(self): """ clean_repo_snapshots Clean out all snapshots that were taken from repos. The repo entries are taken from config file. """ - print "clean snapshots from repos" + print("clean snapshots from repos") local_cfg = self.api.get_config_from_file() if local_cfg['repos_to_clean']: repo_list = local_cfg['repos_to_clean'].split(', ') else: - print "Error: Prefix list is empty: please add repos_to_clean to your configfile!" + print("Error: Prefix list is empty: please add repos_to_clean to your configfile!") if local_cfg['package_prefixes']: pack_pref_list = local_cfg['package_prefixes'].split(', ') else: - print "Error: Prefix list is empty: please add package_prefixes to your configfile!" + print("Error: Prefix list is empty: please add package_prefixes to your configfile!") for repo_name in repo_list: - print repo_name + print(repo_name) for pack_prefix in pack_pref_list: - print pack_prefix + print(pack_prefix) self.clean_last_packages(repo_name, pack_prefix, 100) def publish_switch_3rdparty_production(self): """ publish_switch_s3_3rd_party_production Publish the latest 3rd party snapshot from staging to production, only if there is new content available. """ - print "publish_switch_s3_3rd_party_production" + print("publish_switch_s3_3rd_party_production") # Get Config local_cfg = self.api.get_config_from_file() if local_cfg['repos']: s3_list = local_cfg['repos'].split(', ') else: - print "Error: Prefix list is empty: please add s3 buckets to your configfile!" + print("Error: Prefix list is empty: please add s3 buckets to your configfile!") if local_cfg['staging_snap_pre_post']: prefix_postfix = local_cfg['staging_snap_pre_post'].split(', ') else: - print "Error: Prefix list is empty: please add staging_snap_pre_post to your configfile!" + print("Error: Prefix list is empty: please add staging_snap_pre_post to your configfile!") # Diff snapshots from mirrors # Temphack @@ -292,20 +292,20 @@ def publish_switch_3rdparty_production(self): # Decide if it should be released to production if res == "EMPTY": - print "New snapshot has no new packages. No need to release to production!" + print("New snapshot has no new packages. No need to release to production!") else: - print "New packages were found...", res + print("New packages were found...", res) # Get most actual snapshot from 3rdparty staging last_snap = self.get_last_snapshots(prefix_postfix[0], 1, prefix_postfix[1]) - print "This is the new snapshot: ", last_snap + print("This is the new snapshot: ", last_snap) # publish snapshots to production on s3 - print ("Publish ", last_snap, s3_list[0]) + print(("Publish ", last_snap, s3_list[0])) self.api.publish_switch(s3_list[0], last_snap, "precise", "main", 0) - print ("Publish ", last_snap, s3_list[1]) + print(("Publish ", last_snap, s3_list[1])) self.api.publish_switch(s3_list[1], last_snap, "precise", "main", 0) # clean out