diff options
author | Chris Packham <judge.packham@gmail.com> | 2020-11-23 06:56:31 (GMT) |
---|---|---|
committer | Chris Packham <judge.packham@gmail.com> | 2020-11-23 06:56:31 (GMT) |
commit | f7f3b0b180e5e37ddb4d678d937650822e8e0e3f (patch) | |
tree | 534ded5a8a82953036d23114fa11987175e5afdd /bootstrap | |
parent | 3c177b39d2ad95516ad74c3d8bf3cf88a24967c2 (diff) | |
parent | cd7098d41b1719f1ec8c5720d601d153dd0f67f5 (diff) |
Merge branch 'jemarch-oracle/ol-support'
Diffstat (limited to 'bootstrap')
-rwxr-xr-x | bootstrap | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -574,6 +574,9 @@ enter_fork() info[pkg_name]=${fork} info[pkg_label]=${fork} info[mirrors]= + info[src_release]= + info[src_devel]= + info[src_custom]= info[archive_filename]='@{pkg_name}-@{version}' info[archive_dirname]='@{pkg_name}-@{version}' info[versionlocked]= @@ -646,7 +649,11 @@ enter_milestone() info[ms]=${ms} if [ -n "${info[ver]}" ]; then - info[version_cmp_milestone]=`cmp_versions ${info[ver]} ${info[ms]}` + if [ -n "${info[version_number]}" ]; then + info[version_cmp_milestone]=`cmp_versions ${info[version_number]} ${info[ms]}` + else + info[version_cmp_milestone]=`cmp_versions ${info[ver]} ${info[ms]}` + fi fi } |