[PC-BSD Commits] r18522 - in pcbsd/current/overlays: desktop-overlay/var/db/pc-netupdate/meta-pcbsd desktop-overlay/var/db/pc-netupdate/meta-warden server-overlay/var/db/pc-netupdate/meta-pcbsd server-overlay/var/db/pc-netupdate/meta-warden

svn at pcbsd.org svn at pcbsd.org
Mon Aug 20 11:46:12 PDT 2012


Author: kris
Date: 2012-08-20 18:46:12 +0000 (Mon, 20 Aug 2012)
New Revision: 18522

Modified:
   pcbsd/current/overlays/desktop-overlay/var/db/pc-netupdate/meta-pcbsd/update.sh
   pcbsd/current/overlays/desktop-overlay/var/db/pc-netupdate/meta-warden/update.sh
   pcbsd/current/overlays/server-overlay/var/db/pc-netupdate/meta-pcbsd/update.sh
   pcbsd/current/overlays/server-overlay/var/db/pc-netupdate/meta-warden/update.sh
Log:

Fix downloading new meta-data from mirrors



Modified: pcbsd/current/overlays/desktop-overlay/var/db/pc-netupdate/meta-pcbsd/update.sh
===================================================================
--- pcbsd/current/overlays/desktop-overlay/var/db/pc-netupdate/meta-pcbsd/update.sh	2012-08-20 18:05:41 UTC (rev 18521)
+++ pcbsd/current/overlays/desktop-overlay/var/db/pc-netupdate/meta-pcbsd/update.sh	2012-08-20 18:46:12 UTC (rev 18522)
@@ -12,7 +12,7 @@
 rmdir /tmp/metaup.$$
 
 # Is this the correct version?
-if [ `cat /tmp/metaup.$$/pcbsd-tag` != `pbreg get /PC-BSD/Version` ] ; then
+if [ "$tag" != `pbreg get /PC-BSD/Version` ] ; then
   echo "Meta-Update mismatch!"
   exit 0
 fi 

Modified: pcbsd/current/overlays/desktop-overlay/var/db/pc-netupdate/meta-warden/update.sh
===================================================================
--- pcbsd/current/overlays/desktop-overlay/var/db/pc-netupdate/meta-warden/update.sh	2012-08-20 18:05:41 UTC (rev 18521)
+++ pcbsd/current/overlays/desktop-overlay/var/db/pc-netupdate/meta-warden/update.sh	2012-08-20 18:46:12 UTC (rev 18522)
@@ -12,7 +12,7 @@
 rmdir /tmp/metaup.$$
 
 # Is this the correct version?
-if [ `cat /tmp/metaup.$$/pcbsd-tag` != `pbreg get /PC-BSD/Version` ] ; then
+if [ "$tag" != `pbreg get /PC-BSD/Version` ] ; then
   echo "Meta-Update mismatch!"
   exit 0
 fi

Modified: pcbsd/current/overlays/server-overlay/var/db/pc-netupdate/meta-pcbsd/update.sh
===================================================================
--- pcbsd/current/overlays/server-overlay/var/db/pc-netupdate/meta-pcbsd/update.sh	2012-08-20 18:05:41 UTC (rev 18521)
+++ pcbsd/current/overlays/server-overlay/var/db/pc-netupdate/meta-pcbsd/update.sh	2012-08-20 18:46:12 UTC (rev 18522)
@@ -4,6 +4,19 @@
 if [ -z "$PKGSET" ] ; then exit 1 ; fi
 PKDIR="/var/db/pc-metapkgmanager/pkgsets/${PKGSET}"
 
+# Make sure this tag matches the system version
+mkdir /tmp/metaup.$$
+tar xvf ${1} -C /tmp/metaup.$$ ./pcbsd-tag 2>/dev/null
+tag=`cat /tmp/metaup.$$/pcbsd-tag`
+rm /tmp/metaup.$$/pcbsd-tag
+rmdir /tmp/metaup.$$
+
+# Is this the correct version?
+if [ "$tag" != `pbreg get /PC-BSD/Version` ] ; then
+  echo "Meta-Update mismatch!"
+  exit 0
+fi 
+
 # Save the old master index to search for updates
 if [ -e "${PKDIR}/master-pkg-index" ] ; then
   cat ${PKDIR}/master-pkg-index | cut -d ':' -f 1-2 >> ${PKDIR}/master-pkg-index-old 

Modified: pcbsd/current/overlays/server-overlay/var/db/pc-netupdate/meta-warden/update.sh
===================================================================
--- pcbsd/current/overlays/server-overlay/var/db/pc-netupdate/meta-warden/update.sh	2012-08-20 18:05:41 UTC (rev 18521)
+++ pcbsd/current/overlays/server-overlay/var/db/pc-netupdate/meta-warden/update.sh	2012-08-20 18:46:12 UTC (rev 18522)
@@ -4,6 +4,19 @@
 if [ -z "$PKGSET" ] ; then exit 1 ; fi
 PKDIR="/var/db/pc-metapkgmanager/pkgsets/${PKGSET}"
 
+# Make sure this tag matches the system version
+mkdir /tmp/metaup.$$
+tar xvf ${1} -C /tmp/metaup.$$ ./pcbsd-tag 2>/dev/null
+tag=`cat /tmp/metaup.$$/pcbsd-tag`
+rm /tmp/metaup.$$/pcbsd-tag
+rmdir /tmp/metaup.$$
+
+# Is this the correct version?
+if [ "$tag" != `pbreg get /PC-BSD/Version` ] ; then
+  echo "Meta-Update mismatch!"
+  exit 0
+fi
+
 # Save the old master index to search for updates
 if [ -e "${PKDIR}/master-pkg-index" ] ; then
   cat ${PKDIR}/master-pkg-index | cut -d ':' -f 1-2 >> ${PKDIR}/master-pkg-index-old 



More information about the Commits mailing list