[Fai-commit] r3087 - in trunk: bin debian

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-11-23 19:15:50 +0000 (Wed, 23 Nov 2005)
New Revision: 3087

Modified:
   trunk/bin/fai-mirror
   trunk/debian/changelog
Log:
test if $mirrordir starts with a slash (closes: #328139)


Modified: trunk/bin/fai-mirror
===================================================================
--- trunk/bin/fai-mirror	2005-11-23 19:12:09 UTC (rev 3086)
+++ trunk/bin/fai-mirror	2005-11-23 19:15:50 UTC (rev 3087)
@@ -25,7 +25,7 @@
 # MA 02111-1307, USA.
 #*********************************************************************
 
-version="Version 1.4.1, 11-nov-2005"
+version="Version 1.4.2, 23-nov-2005"
 
 # variables: NFSROOT, FAI_CONFIGDIR
 # NFSROOT_PACKAGES, packages from make-fai-nfsroot.conf
@@ -237,8 +237,9 @@
 
 mirrordir=$1
 if [ -z "$mirrordir" ]; then
-    die 2 "Please give the directory for the mirror."
+    die 2 "Please give the absolute path to the mirror."
 fi
+{ echo $mirrordir | egrep -q '^/'; } || die 4 "Mirrordir must start with a slash /."
 if [ -d $mirrordir/pool -o -d $mirrordir/dists ]; then
     die 3 "Please first remove $mirrordir/pool and $mirrordir/dists"
 fi

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-11-23 19:12:09 UTC (rev 3086)
+++ trunk/debian/changelog	2005-11-23 19:15:50 UTC (rev 3087)
@@ -17,7 +17,8 @@
     (closes: #312128) 
   * fai-mirror: add -i to egrep (closes: #312508), add option
     DPkg::force-conflicts::=yes (closes: #328138), only aptitude can
-    install conflicting packages
+    install conflicting packages, test if $mirrordir starts with a slash
+    (closes: #328139)
   * fai-do-scripts: do not execute S[0-9][0-9]* any more (closes: #310999)
   * fcopy: add preinst support, ignore .svn dirs (closes: #297550), do
     chroot before using getpwnam (closes: #283475)