[Pbuilder-maint] pbuilder CVS update: pbuilder ChangeLog pbuilder-satisfydepends-experimental

[pbuilder CVS Commit]

  User: lool    
  Date: 06/12/09 16:00:43

  Modified:    .        ChangeLog pbuilder-satisfydepends-experimental
  Log:
  * pbuilder-satisfydepends-experimental: small optimization: return the
    exact requested version when a strictly versionned dependency is used.
  
  Revision  Changes    Path
  1.424     +4 -2      pbuilder/ChangeLog
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?annotate=1.424&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?rev=1.424&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog.diff?r1=1.424&r2=1.423&cvsroot=
  
  -----------------------------------
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvsroot/pbuilder/pbuilder/ChangeLog,v
  retrieving revision 1.423
  retrieving revision 1.424
  diff -u -r1.423 -r1.424
  --- ChangeLog	9 Dec 2006 14:53:16 -0000	1.423
  +++ ChangeLog	9 Dec 2006 15:00:42 -0000	1.424
  @@ -1,8 +1,10 @@
  -2006-12-09
  +2006-12-09  Loic Minier <lool at dooz.org>
   
   	* pbuilder-satisfydepends-experimental: small optimization: move
   	COMPARESTRING and DEPSVERSION computation out of the per-version loop;
   	quote COMPARESTRING properly.
  +	* pbuilder-satisfydepends-experimental: small optimization: return the
  +	exact requested version when a strictly versionned dependency is used.
   
   2006-11-14  Loic Minier <lool at dooz.org>
   
  
  
  
  1.3       +14 -9     pbuilder/pbuilder-satisfydepends-experimental
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-satisfydepends-experimental?annotate=1.3&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-satisfydepends-experimental?rev=1.3&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-satisfydepends-experimental.diff?r1=1.3&r2=1.2&cvsroot=
  
  -----------------------------------
  
  Index: pbuilder-satisfydepends-experimental
  ===================================================================
  RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-satisfydepends-experimental,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pbuilder-satisfydepends-experimental	9 Dec 2006 14:53:16 -0000	1.2
  +++ pbuilder-satisfydepends-experimental	9 Dec 2006 15:00:42 -0000	1.3
  @@ -114,17 +114,22 @@
   	    PACKAGEVERSIONS="$( package_versions "$PACKAGE" | tac | xargs )"
   	    CANDIDATE_VERSION="$( candidate_version "$PACKAGE" )"
   
  -	    # try the candidate version, then all available versions (asc)
   	    COMPARESTRING="$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*([ ]*\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\1/')"
   	    DEPSVERSION="$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*([ ]*\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\2/')"
  -	    for VERSION in $CANDIDATE_VERSION $PACKAGEVERSIONS; do
  -		if dpkg --compare-versions "$VERSION" "$COMPARESTRING" "$DEPSVERSION"; then
  -		    if [ $VERSION != $CANDIDATE_VERSION ]; then
  -			PACKAGE_WITHVERSION="$PACKAGE=$VERSION"
  +	    # if strictly versionned, we skip to outputting that version
  +	    if [ "=" = "$COMPARESTRING" ]; then
  +		PACKAGE_WITHVERSION="$PACKAGE=$DEPSVERSION"
  +	    else
  +		# try the candidate version, then all available versions (asc)
  +		for VERSION in $CANDIDATE_VERSION $PACKAGEVERSIONS; do
  +		    if dpkg --compare-versions "$VERSION" "$COMPARESTRING" "$DEPSVERSION"; then
  +			if [ $VERSION != $CANDIDATE_VERSION ]; then
  +			    PACKAGE_WITHVERSION="$PACKAGE=$VERSION"
  +			fi
  +			break;
   		    fi
  -		    break;
  -		fi
  -	    done
  +		done
  +	    fi
   	fi
   
   	echo "$PACKAGE_WITHVERSION"