zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added support for MD5 values sets into the book sources.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-05-06 20:03:02 +00:00
parent d29584bb22
commit 26053c44b2
2 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
common/common-functions
View file

@ -640,7 +640,7 @@ extract_commands() { #
get_sources() { # Download file, write name to MISSING_FILES.DMP if an error get_sources() { # Download file, write name to MISSING_FILES.DMP if an error
#----------------------------# #----------------------------#
local saveIFS=$IFS local saveIFS=$IFS
local IFS line URL1 URL2 FILE MD5 HAVEMD5 fromARCHIVE local IFS line URL1 URL2 FILE BOOKMD5 MD5 HAVEMD5 fromARCHIVE
# Test if the packages must be downloaded # Test if the packages must be downloaded
[ ! "$GETPKG" = "1" ] && return [ ! "$GETPKG" = "1" ] && return
@ -680,17 +680,23 @@ get_sources() { # Download file, write name to MISSING_FILES.DMP if
# Locations # Locations
URL1=`echo $line | cut -d" " -f2` # Preferred URL URL1=`echo $line | cut -d" " -f2` # Preferred URL
URL2=`echo $line | cut -d" " -f1` # Fallback Upstream URL URL2=`echo $line | cut -d" " -f1` # Fallback Upstream URL
FILE=`basename $URL2` # File name FILE=`basename $URL1` # File name
BOOKMD5=`echo $line | cut -d" " -f3` # MD5 book value
# Find the md5 sum for this package. if [[ x"$BOOKMD5" != "x" ]]; then
set +e HAVEMD5=1
HAVEMD5=1 # Always assume we have a MD5SUM MD5="$BOOKMD5 $FILE"
MD5=`grep " $FILE" MD5SUMS` else
if [ $? -ne 0 ]; then # Find the md5 sum for this package in the server MD5SUMS file.
set -e set +e
gs_wrt_message "$FILE not found in MD5SUMS" HAVEMD5=1 # Always assume we have a MD5SUM
# IMPORTANT:: There is no MD5SUM for this file. MD5=`grep " $FILE" MD5SUMS`
HAVEMD5=0 if [ $? -ne 0 ]; then
set -e
gs_wrt_message "$FILE not found in MD5SUMS"
# IMPORTANT:: There is no MD5SUM for this file.
HAVEMD5=0
fi
fi fi
set -e set -e

15
common/urls.xsl
View file

@ -41,10 +41,16 @@
</xsl:variable> </xsl:variable>
<xsl:variable name="dirname" select="substring-before($package2, '-0')"/> <xsl:variable name="dirname" select="substring-before($package2, '-0')"/>
<!-- Write the upstream URLs, except the redirected ones --> <!-- Write the upstream URLs, except the redirected ones -->
<xsl:if test="not(contains(@url,'?'))"> <xsl:choose>
<xsl:value-of select="@url"/> <xsl:when test="contains(@url,'?')">
</xsl:if> <xsl:text>dummy-url</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="@url"/>
</xsl:otherwise>
</xsl:choose>
<xsl:text> </xsl:text> <xsl:text> </xsl:text>
<!-- Write FTP mirror URLs -->
<xsl:value-of select="$server"/> <xsl:value-of select="$server"/>
<xsl:text>/pub/lfs/conglomeration/</xsl:text> <xsl:text>/pub/lfs/conglomeration/</xsl:text>
<xsl:choose> <xsl:choose>
@ -74,6 +80,9 @@
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
<xsl:value-of select="$package"/> <xsl:value-of select="$package"/>
<!-- Write MD5SUM value -->
<xsl:text> </xsl:text>
<xsl:value-of select="../../para[3]/literal"/>
<xsl:text>&#x0a;</xsl:text> <xsl:text>&#x0a;</xsl:text>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>