#9122: installoptionalpackage needs to pull from r1alpha4 -----------------------+------------------------------ Reporter: mmadia | Owner: nobody Type: bug | Status: new Priority: critical | Milestone: R1/alpha4 Component: - General | Version: R1/Development Keywords: | Blocked By: Blocking: | Has a Patch: 0 Platform: All | -----------------------+------------------------------ Currently, installoptionalpackage is broken on r1a4 for two reasons. i. the parsing of uname -v "hrevr1alpha4-<int>" for the variable revisionTag strips off "-<int>" i. 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 } }}} -- Ticket URL: <http://dev.haiku-os.org/ticket/9122> Haiku <http://dev.haiku-os.org> Haiku - the operating system.