summaryrefslogtreecommitdiffstats
path: root/client/shared/scripts/createDiffImage
diff options
context:
space:
mode:
authoririna <irinagomez@us.es>2017-03-28 07:47:28 +0000
committeririna <irinagomez@us.es>2017-03-28 07:47:28 +0000
commite784187357dbdd96227c5de58ebaad32ed444084 (patch)
tree7d3888ba16ea88d0495a5fa80c008432ead3d6ca /client/shared/scripts/createDiffImage
parentce7af22d759b17cb8e1f2fc5fadac533d4942f01 (diff)
#771 ogGetSizeParameters: En la salida se incluye el espacio disponible en el repositorio. Los script de creación de imagen se adaptan al cambio.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5248 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/shared/scripts/createDiffImage')
-rwxr-xr-xclient/shared/scripts/createDiffImage7
1 files changed, 5 insertions, 2 deletions
diff --git a/client/shared/scripts/createDiffImage b/client/shared/scripts/createDiffImage
index 862c05c8..2d0e8fb3 100755
--- a/client/shared/scripts/createDiffImage
+++ b/client/shared/scripts/createDiffImage
@@ -25,6 +25,9 @@
#@version 1.0 - creacion de la diferencial con rsync y btrfs
#@author
#@date 2012-12-04
+#@version 1.1.0 - Se muestra el espacio necesario para alojar la imagen y el disponible (ticket #771)
+#@author Irina Gomez - ETSII Universidad de Sevilla
+#@date 2017-03-28
#*/ ##
trap "onexit $1 $2 $3 \"$4\" \"$5\"" 1 2 3 6 9 14 15 EXIT
@@ -127,9 +130,9 @@ ogCreateInfoImage $1 $2 $3 "$4" "${DIFFTYPE}"
[ $? -eq $OG_ERR_NOTDIFFERENT ] && exit $(ogRaiseError session $OG_ERR_NOTDIFFERENT; echo $?)
#Comprobar espacio que requerira la imagen para ser almacenada
-read SIZEDATA SIZEREQUIRED ISENOUGHSPACE <<< $(ogGetSizeParameters $1 $2 "$3" DIFF)
+read SIZEDATA SIZEREQUIRED SIZEFREE ISENOUGHSPACE <<< $(ogGetSizeParameters $1 $2 "$3" DIFF)
-ogEcho log session "[50] $PROG: $MSG_SCRIPTS_CREATE_SIZE $SIZEREQUIRED"
+ogEcho log session "[50] $PROG: $MSG_SCRIPTS_CREATE_SIZE $SIZEREQUIRED $SIZEFREE"
[ "$ISENOUGHSPACE" == "TRUE" ] || exit $(ogRaiseError session $OG_ERR_CACHESIZE "$3"; echo $?)
#Calculamos el tamaño de la imagen: