[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.4.4+dfsg1-1-35-g042f641

[Ondřej Surý]

The following commit has been merged in the master-experimental branch:
commit b3d665a7442bc08aea5a625e3a6081be93104783
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon Oct 15 17:21:44 2012 +0200

    Remove vendor/rails link and don't mkdir lib/plugins, it has to bee there

diff --git a/debian/postinst b/debian/postinst
index 9416f60..a49e114 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -66,14 +66,13 @@ case "$1" in
 			rm -f vendor/railties
 			rm -f vendor/rails
 		fi
-		if [ ! -L vendor/rails ]; then
-			ln -s "$fRailsDir" vendor/rails
-		else
+		if [ -L vendor/rails ]; then
 			# rails 2.3 to ruby-rails-2.3 migration
 			fMigrateLink=$(readlink vendor/rails)
 			if [ "$fMigrateLink" != "$fRailsDir" ]; then
 				rm -f vendor/rails
-				ln -s "$fRailsDir" vendor/rails
+			else
+			        echo "Inconsistent link in vendor/rails, please remove manually"
 			fi
 		fi
 		if [ ! -e app/views/members ]; then
@@ -82,9 +81,6 @@ case "$1" in
 		if [ ! -e app/sweepers ]; then
 			mkdir app/sweepers
 		fi
-		if [ ! -e lib/plugins ]; then
-			mkdir lib/plugins
-		fi
 		# this directory should never be used: /usr not writable policy
 		if [ -e tmp ]; then
 			rm -rf tmp

-- 
redmine.git