Procházet zdrojové kódy

* prepare-release:
- apt-inst version isn't apt versions, so don't override variable

David Kalnischkies před 14 roky
rodič
revize
58921d7d06
2 změnil soubory, kde provedl 5 přidání a 3 odebrání
  1. 2 0
      debian/changelog
  2. 3 3
      prepare-release

+ 2 - 0
debian/changelog

@@ -6,6 +6,8 @@ apt (0.9.4) UNRELEASED; urgency=low
       as we don't need a symbol for it as it is not in a header
       as we don't need a symbol for it as it is not in a header
   * Makefile, buildlib/*.mak:
   * Makefile, buildlib/*.mak:
     - reshuffle dependencies so that parallel building seems to work
     - reshuffle dependencies so that parallel building seems to work
+  * prepare-release:
+    - apt-inst version isn't apt versions, so don't override variable
 
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 11 May 2012 23:26:59 +0200
  -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 11 May 2012 23:26:59 +0200
 
 

+ 3 - 3
prepare-release

@@ -8,8 +8,8 @@ LIBAPTINSTVERSION="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)"
 
 
 if [ "$1" = 'pre-export' ]; then
 if [ "$1" = 'pre-export' ]; then
 	libraryversioncheck() {
 	libraryversioncheck() {
-		LIBRARY="$1"
-		VERSION="$2"
+		local LIBRARY="$1"
+		local VERSION="$2"
 		if [ ! -e "debian/${LIBRARY}${VERSION}.symbols" ]; then
 		if [ ! -e "debian/${LIBRARY}${VERSION}.symbols" ]; then
 		   echo >&2 "Library ${LIBRARY} in version ${VERSION} has no symbols file! (maybe forgot to rename?)"
 		   echo >&2 "Library ${LIBRARY} in version ${VERSION} has no symbols file! (maybe forgot to rename?)"
 		   exit 1
 		   exit 1
@@ -49,7 +49,7 @@ elif [ "$1" = 'post-build' ]; then
 elif [ "$1" = 'library' ]; then
 elif [ "$1" = 'library' ]; then
 	librarysymbols() {
 	librarysymbols() {
 		echo "Checking $1 in version $2"
 		echo "Checking $1 in version $2"
-		tmpfile=$(mktemp)
+		local tmpfile=$(mktemp)
 		dpkg-gensymbols -p${1}${2} -ebuild/bin/${1}.so.${2} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile
 		dpkg-gensymbols -p${1}${2} -ebuild/bin/${1}.so.${2} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile
 		echo '=== Missing symbols:'
 		echo '=== Missing symbols:'
 		grep '^+#MISSING' $tmpfile
 		grep '^+#MISSING' $tmpfile