From a4d44e6ae57dfaedb2cf8da1fee1fa9e504d26f7 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Mon, 1 Nov 2010 17:46:29 +0000 Subject: [PATCH] 2010-11-01 Miguel de Dios * DEBIAN/make_deb_package.sh: fixed recursive infinite loop with try to copy "temp_package" into "temp_package/usr/share/pandora_agent/temp_package" again and again. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3488 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/unix/DEBIAN/make_deb_package.sh | 12 +++++++++++- pandora_server/ChangeLog | 6 ++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 687a191bed..d9e9c4f96a 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -44,7 +44,17 @@ echo "Make directory system tree for package." cp DEBIAN temp_package -R chmod 755 -R temp_package/DEBIAN -cp -aRf * temp_package/usr/share/pandora_agent/ +#Next lines is same to +#cp -aRf * temp_package/usr/share/pandora_agent/ +#but don't copy recursive the temp_package into temp_package + +for item in `ls` +do + if [ $item != 'temp_package' ] + then + cp -aRf $item temp_package/usr/share/pandora_agent/ + fi +done cp -aRf tentacle_client temp_package/usr/bin/ cp -aRf pandora_agent temp_package/usr/bin/ cp -aRf pandora_exec temp_package/usr/bin/ diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 43e02d714e..71e2202362 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,9 @@ +2010-11-01 Miguel de Dios + + * DEBIAN/make_deb_package.sh: fixed recursive infinite loop with try to + copy "temp_package" into "temp_package/usr/share/pandora_agent/temp_package" + again and again. + 2010-11-01 Sancho Lerena * DEBIAN/control,