jhernandez/cas_wrapper
1
0
Fork 0
forked from almalinux/cas_wrapper
Code Issues Pull Requests Releases Activity

Compare commits

base: jhernandez:add_bom_argument
Branches Tags
jhernandez:master
jhernandez:ALBS-662
jhernandez:ALBS-576
jhernandez:add_bom_argument
jhernandez:ALBS-444
jhernandez:ALBS-443
almalinux:master
almalinux:add_bom_argument
almalinux:0.0.3
almalinux:0.0.1
almalinux:0.0.2
almalinux:0.0.4
almalinux:0.0.5
almalinux:0.0.6
..
compare: jhernandez:master
Branches Tags
jhernandez:ALBS-662
jhernandez:ALBS-576
jhernandez:add_bom_argument
jhernandez:master
jhernandez:ALBS-444
jhernandez:ALBS-443
almalinux:master
almalinux:add_bom_argument
almalinux:0.0.3
almalinux:0.0.1
almalinux:0.0.2
almalinux:0.0.4
almalinux:0.0.5
almalinux:0.0.6

No commits in common. "add_bom_argument" and "master" have entirely different histories.
add_bom_ar ... master

2 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

6
cas_wrapper.py
View File

@ -52,7 +52,6 @@ class CasWrapper:
""" """
command = self._cas[ command = self._cas[
'notarize', 'notarize',
'--bom',
local_path, local_path,
'-o', '-o',
'json', 'json',
@ -89,7 +88,7 @@ class CasWrapper:
""" """
command_args = ['authenticate', local_path] command_args = ['authenticate', local_path]
if use_hash: if use_hash:
command_args = ['authenticate', '--bom', '--hash', local_path] command_args = ['authenticate', '--hash', local_path]
command_args.extend(('-o', 'json')) command_args.extend(('-o', 'json'))
command = self._cas[command_args] command = self._cas[command_args]
try: try:
@ -120,9 +119,9 @@ class CasWrapper:
""" """
is_authenticated = False is_authenticated = False
commit_cas_hash = None commit_cas_hash = None
self.ensure_login()
try: try:
result_json = self.authenticate(local_path, return_json=True) result_json = self.authenticate(local_path, return_json=True)
self._logger.error(result_json)
is_authenticated = result_json['verified'] is_authenticated = result_json['verified']
commit_cas_hash = result_json['hash'] commit_cas_hash = result_json['hash']
# we can fall with ProcessExecutionError, # we can fall with ProcessExecutionError,
@ -141,6 +140,7 @@ class CasWrapper:
Returns authenticate result. Returns authenticate result.
""" """
is_authenticated = False is_authenticated = False
self.ensure_login()
try: try:
is_authenticated = self.authenticate( is_authenticated = self.authenticate(
local_path, local_path,

2
setup.py
View File

@ -2,7 +2,7 @@ from setuptools import setup
setup( setup(
name="cas_wrapper", name="cas_wrapper",
version="0.0.3", version="0.0.2",
author="Stepan Oksanichenko", author="Stepan Oksanichenko",
author_email="soksanichenko@almalinux.org", author_email="soksanichenko@almalinux.org",
description="The python wrapper around binary cas from " description="The python wrapper around binary cas from "