deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 20:31:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

fix openssl dlls

Browse Source
This commit is contained in:
Jay Lee
2020-03-26 15:10:07 -04:00
parent e15a93ebcb
commit da90239e2b
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -275,6 +275,9 @@ script:
- if [ "$e2e" = true ]; then $gam whatis $newuser; fi - if [ "$e2e" = true ]; then $gam whatis $newuser; fi
- if [ "$e2e" = true ]; then $gam user $gam_user show tokens; fi - if [ "$e2e" = true ]; then $gam user $gam_user show tokens; fi
- if [ "$e2e" = true ]; then $gam print exports matter "Travis matter $newbase" | $gam csv - gam download export id:~~matterId~~ id:~~id~~; fi - if [ "$e2e" = true ]; then $gam print exports matter "Travis matter $newbase" | $gam csv - gam download export id:~~matterId~~ id:~~id~~; fi
- if [ "$e2e" = true ]; then $gam delete hold "Travis hold $newbase" matter "Travis matter $newbase"; fi
- if [ "$e2e" = true ]; then $gam update matter "Travis matter $newbase" action close; fi
- if [ "$e2e" = true ]; then $gam update matter "Travis matter $newbase" action delete; fi
- if [ "$e2e" = true ]; then $gam delete user $newuser; fi - if [ "$e2e" = true ]; then $gam delete user $newuser; fi
- if [ "$e2e" = true ]; then $gam print users query "travis.jid=$jid" | $gam csv - gam delete user ~primaryEmail; fi - if [ "$e2e" = true ]; then $gam print users query "travis.jid=$jid" | $gam csv - gam delete user ~primaryEmail; fi
- if [ "$e2e" = true ]; then $gam print mobile; fi - if [ "$e2e" = true ]; then $gam print mobile; fi

2
src/gapi/vault.py
View File

@@ -702,7 +702,6 @@ def printExports():
matterState = matter['state'] matterState = matter['state']
matterId = matter['matterId'] matterId = matter['matterId']
if matterState != 'OPEN': if matterState != 'OPEN':
print(f'ignoring matter {matterId} in state {matterState}')
continue continue
matterIds.append(matterId) matterIds.append(matterId)
else: else:
@@ -746,7 +745,6 @@ def printHolds():
matterState = matter['state'] matterState = matter['state']
matterId = matter['matterId'] matterId = matter['matterId']
if matterState != 'OPEN': if matterState != 'OPEN':
print(f'ignoring matter {matterId} in state {matterState}')
continue continue
matterIds.append(matterId) matterIds.append(matterId)
else: else:

6
src/travis/windows-x86_64-before-install.sh
View File

@@ -13,8 +13,10 @@ export python_file=python-$BUILD_PYTHON_VERSION-amd64.exe
wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/$python_file wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/$python_file
powershell ".\\${python_file} /quiet InstallAllUsers=1 TargetDir=c:\\python" powershell ".\\${python_file} /quiet InstallAllUsers=1 TargetDir=c:\\python"
until cinst -y wixtoolset; do echo "trying again..."; done until cinst -y wixtoolset; do echo "trying again..."; done
until cp -v /c/ssl/libcrypto-1_1-x64.dll /c/python/DLLs/libcrypto-1_1.dll; do echo "trying again..."; done until cp -v /c/ssl/libcrypto-1_1-x64.dll /c/python/DLLs/; do echo "trying libcrypto copy again..."; done
until cp -v /c/ssl/libssl-1_1-x64.dll /c/python/DLLs/libssl-1_1.dll; do echo "trying again..."; done cp -v /c/python/DLLs/libcrypto-1_1-x64.dll /c/python/DLLs/libcrypto-1_1.dll
until cp -v /c/ssl/libssl-1_1-x64.dll /c/python/DLLs/; do echo "trying libssl copy again..."; done
cp -v /c/python/DLLs/libssl-1_1-x64.dll /c/python/DLLs/libssl-1_1.dll
export PATH=$PATH:/c/python/scripts export PATH=$PATH:/c/python/scripts
cd $mypath cd $mypath
export python=/c/python/python.exe export python=/c/python/python.exe