Merge ~bladernr/plainbox-provider-checkbox:1892525-update-maas-version-check into plainbox-provider-checkbox:master

Proposed by Jeff Lane 
Status: Merged
Approved by: Jeff Lane 
Approved revision: 1f73f74e072c3ee9a003f3efa91569062b027af2
Merged at revision: 668a440b6b98871a691cd077a24beb2a5d9314bd
Proposed branch: ~bladernr/plainbox-provider-checkbox:1892525-update-maas-version-check
Merge into: plainbox-provider-checkbox:master
Diff against target: 23 lines (+1/-4)
1 file modified
bin/maas-version-check.sh (+1/-4)
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Review via email: mp+389666@code.launchpad.net

Commit message

lp:1892525 - remove the version comparison in maas-version-check as it is no longer needed and was causing unnecessary failures.

Description of the change

lp:1892525 - remove the version comparison in maas-version-check as it is no longer needed and was causing unnecessary failures.

To post a comment you must log in.
Revision history for this message
Jeff Lane  (bladernr) wrote :

self-approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/maas-version-check.sh b/bin/maas-version-check.sh
2index 6856354..25e233f 100755
3--- a/bin/maas-version-check.sh
4+++ b/bin/maas-version-check.sh
5@@ -18,17 +18,14 @@
6 # along with this program. If not, see <http://www.gnu.org/licenses/>.
7
8 MAAS_FILE="/etc/installed-by-maas"
9-MIN_VERSION="2.0"
10
11 # Is the file there?
12 if [ -s $MAAS_FILE ]; then
13 maas_version=$(cat $MAAS_FILE)
14 echo "$maas_version"
15+ exit 0
16 else
17 echo "ERROR: This system does not appear to have been installed by MAAS"
18 echo "ERROR: " "$(ls -l $MAAS_FILE 2>&1)"
19 exit 1
20 fi
21-
22-#is the version appropriate
23-exit "$(dpkg --compare-versions "$maas_version" "ge" $MIN_VERSION)"

Subscribers

People subscribed via source and target branches