Opened 5 years ago

Closed 5 years ago

#9122 closed bug (fixed)

installoptionalpackage needs to pull from r1alpha4

Reported by: Matt Madia Owned by: Nobody
Priority: critical Milestone: R1/alpha4
Component: - General Version: R1/alpha3
Keywords: Cc:
Blocked By: Blocking:
Has a Patch: yes Platform: All

Description

Currently, installoptionalpackage is broken on r1a4 for two reasons.

  1. the parsing of uname -v "hrevr1alpha4-<int>" for the variable revisionTag strips off "-<int>"
  2. the r1alpha4 branch isn't pulled from.

The following code is untested, but *should* work. ... due to an issue with my local git tree and real time constraints, I can't make an actual patch tonight.

The changes in the function is to add "?h=r1alpha4" to the local url variable, which will pull the build files from the correct branch. It also makes an assumption that pulling the newest files from the r1alpha4 branch is desirable. Considering that once r1alpha4 is released to the public there will be no additional commits, IMO it is a safe assumption.

function GetBuildFile()
{
	# GetBuildFile <file>
	# Downloads files from Haiku's svn
	local buildfile="$1"
	if ! [ -f ${baseDir}/${buildfile} ] ; then
		echo "Fetching ${buildfile} ..."
		cd ${baseDir}
		local baseURL=http://cgit.haiku-os.org/haiku/plain
		#local revisionTag=`uname -v | awk '{print $1}' | sed -e 's/-.*//'`
		#	# the sed invocation above drops potential dirty markers off the
		#	# revision tag
		#local url="${baseURL}/build/jam/${buildfile}?id=${revisionTag}"
		local url="${baseURL}/build/jam/${buildfile}?h=r1alpha4"
		wget -q ${url} -O ${buildfile} \
			|| ErrorExit "...failed to download $buildfile"
	fi
}

Attachments (1)

installoptionalpackage.diff (910 bytes) - added by Alexander von Gluck 5 years ago.
hrev1 based on mmadia's changes

Download all attachments as: .zip

Change History (6)

comment:1 Changed 5 years ago by Alexander von Gluck

this is the last remaining issue in R1A4... looking into now

Changed 5 years ago by Alexander von Gluck

Attachment: installoptionalpackage.diff added

hrev1 based on mmadia's changes

comment:2 Changed 5 years ago by Alexander von Gluck

Has a Patch: set

comment:3 Changed 5 years ago by Alexander von Gluck

picked in hrevr1alpha4-44696

*seems* to work... mmadia, feel free to make any last minute changes though if you find a problem :D

comment:4 Changed 5 years ago by John

Well, we've released, so I guess this bug should be closed...

comment:5 Changed 5 years ago by Alexander von Gluck

Resolution: fixed
Status: newclosed
Version: R1/DevelopmentR1/alpha3

I agree :)

Note: See TracTickets for help on using tickets.