From 65b4c066a000fafcbc9e21c07572877b85649b42 Mon Sep 17 00:00:00 2001 From: Nikos Roussos Date: Thu, 14 Sep 2017 09:42:03 +0300 Subject: [PATCH] Check if TLE is valid * Fix remote on CI --- .gitlab-ci.yml | 6 ++---- network/base/views.py | 9 ++++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7237081..8f0a3eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,8 +24,7 @@ stage: - echo "$SSH_PRIVATE_KEY" >> ~/.ssh/id_rsa - chmod -R u=rwX,o=,g= ~/.ssh/ - echo "$SSH_SERVER_HOSTKEY" > ~/.ssh/known_hosts - - git remote add origin ssh://$SERVER_USER@$SERVER_HOST$SERVER_PATH - - git push -u origin dev + - git push -u ssh://$SERVER_USER@$SERVER_HOST$SERVER_PATH dev production: stage: deploy @@ -37,5 +36,4 @@ production: - echo "$SSH_PRIVATE_KEY" >> ~/.ssh/id_rsa - chmod -R u=rwX,o=,g= ~/.ssh/ - echo "$SSH_SERVER_HOSTKEY" > ~/.ssh/known_hosts - - git remote add origin ssh://$SERVER_USER@$SERVER_HOST$SERVER_PATH - - git push -u origin master + - git push -u ssh://$SERVER_USER@$SERVER_HOST$SERVER_PATH master diff --git a/network/base/views.py b/network/base/views.py index e330f9b..3fc9b6c 100644 --- a/network/base/views.py +++ b/network/base/views.py @@ -561,9 +561,12 @@ def station_view(request, id): # using the angles module convert the sexagesimal degree into # something more easily read by a human - elevation = format(math.degrees(altt), '.0f') - azimuth_r = format(math.degrees(azr), '.0f') - azimuth_s = format(math.degrees(azs), '.0f') + try: + elevation = format(math.degrees(altt), '.0f') + azimuth_r = format(math.degrees(azr), '.0f') + azimuth_s = format(math.degrees(azs), '.0f') + except: + continue passid += 1 # show only if >= configured horizon and in next 6 hours,