Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 3 commits
  • 3 files changed
  • 0 comments
  • 1 contributor
6 debian/changelog
... ... @@ -1,3 +1,9 @@
  1 +brightbox-builder (3.0.2-0ubuntu3) oneiric; urgency=low
  2 +
  3 + * Make upload switch off verify certificate if necessary
  4 +
  5 + -- Neil Wilson <neil@aldur.co.uk> Thu, 01 Mar 2012 18:07:09 +0000
  6 +
1 7 brightbox-builder (3.0.2-0ubuntu2) oneiric; urgency=low
2 8
3 9 * Request SSL on the ftp control channel on upload
10 scripts/build/lb_upload_bbftp
@@ -53,14 +53,20 @@ fi
53 53
54 54 if ! brightbox-accounts -s list > /dev/null 2>&1
55 55 then
  56 + if brightbox-accounts -s list 2>&1 | grep -q "ERROR: Unable to verify certificate"
  57 + then
  58 + Echo_warning "Current config unable to verify certificate - disabling"
  59 + BBFLAGS=-k
  60 + else
56 61 Echo_error "No accounts found. Check your api configuration with 'brightbox-config'"
57 62 exit 1
  63 + fi
58 64 fi
59 65
60   -BB_ACCOUNT=$(brightbox-accounts -s list 2>/dev/null | awk 'NR>1{exit};{print $1}')
  66 +BB_ACCOUNT=$(brightbox-accounts ${BBFLAGS} -s list 2>/dev/null | awk 'NR>1{exit};{print $1}')
61 67 Echo_message "Uploading image into account ${BB_ACCOUNT}"
62 68
63   -BB_FTP_DETAILS=$(brightbox-accounts -s reset_ftp_password ${BB_ACCOUNT} 2>/dev/null)
  69 +BB_FTP_DETAILS=$(brightbox-accounts ${BBFLAGS} -s reset_ftp_password ${BB_ACCOUNT} 2>/dev/null)
64 70 BB_FTP_URL=$(echo "${BB_FTP_DETAILS}" | awk '{ ftp_hash[$1] = $2 }; END { printf "ftp://%s/incoming",ftp_hash["library_ftp_host"] }')
65 71 BB_FTP_LOGON=$(echo "${BB_FTP_DETAILS}" | awk '{ ftp_hash[$1] = $2 }; END { printf "%s:%s",ftp_hash["library_ftp_user"],ftp_hash["library_ftp_password"] }')
66 72
9 scripts/build/lb_upload_bbregister
@@ -49,6 +49,13 @@ then
49 49 fail "Can't find brightbox tools. Install brightbox-cli package and configure an api client"
50 50 fi
51 51
  52 +if brightbox-accounts -s list 2>&1 | grep -q "ERROR: Unable to verify certificate"
  53 +then
  54 + Echo_warning "Current config unable to verify certificate - disabling"
  55 + BBFLAGS=-k
  56 +fi
  57 +
  58 +
52 59 case $LB_ARCHITECTURES in
53 60 i386)
54 61 target_arch="i686"
@@ -61,7 +68,7 @@ esac
61 68
62 69 TARGET_NAME=$(echo ${LB_DISTRIBUTION}*)
63 70 Echo_message_running "Registering ${LB_ISO_VOLUME} (${LB_ARCHITECTURES}) from ${TARGET_NAME}"
64   -brightbox-images register --arch="${target_arch}" ${compat} --name="${LB_ISO_VOLUME}" --username="${LB_USERNAME}" --description="${LB_ISO_PUBLISHER}" --source="${TARGET_NAME}"
  71 +brightbox-images ${BBFLAGS} register --arch="${target_arch}" ${compat} --name="${LB_ISO_VOLUME}" --username="${LB_USERNAME}" --description="${LB_ISO_PUBLISHER}" --source="${TARGET_NAME}"
65 72 Echo_status
66 73
67 74 # Creating stage file

No commit comments for this range

Something went wrong with that request. Please try again.