[Rails-commits] Branch 'rails1.7.x' - 2 commits - buildRails.xml rails/common

[Stefan F. <ste...@us...>]

 buildRails.xml                  |    2 +-
 rails/common/ConfigProfile.java |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ab58aaeb53a57b9b714f4d76d0d48d8c1018fe7a
Author: Stefan Frey <ste...@we...>
Date:   Tue Apr 3 13:42:10 2012 +0200

    fixed error in the creation of new profiles that causes an error on other systems

diff --git a/rails/common/ConfigProfile.java b/rails/common/ConfigProfile.java
index 20eee1c..1057a72 100644
--- a/rails/common/ConfigProfile.java
+++ b/rails/common/ConfigProfile.java
@@ -206,6 +206,7 @@ public final class ConfigProfile implements Comparable<ConfigProfile> {
         ensureLoad();
 
         ConfigProfile newProfile = new ConfigProfile(Type.USER, name);
+        newProfile.loaded = true; // the new profile is assumed to be loaded
         
         ConfigProfile reference;
         if (isFinal()) {


commit 7063df618853db00e7b7c52acfe87eb04f0f81a9
Author: Stefan Frey <ste...@we...>
Date:   Tue Apr 3 13:41:33 2012 +0200

    fixed wrong readme.txt reference in build file

diff --git a/buildRails.xml b/buildRails.xml
index 158fc15..93946e1 100644
--- a/buildRails.xml
+++ b/buildRails.xml
@@ -162,7 +162,7 @@
 					<arg value="rails-${version}.tar.gz"/>
 					<arg value="${sf.user},rails@${sf.uri}${sf.filedir}${version}/"/>
 				</exec>
-				<exec executable="scp" dir="../../rails-${version}" failonerror="true">
+				<exec executable="scp" dir="./" failonerror="true">
 					<arg value="readme.txt"/>
 					<arg value="${sf.user},rails@${sf.uri}${sf.filedir}${version}/"/>
 				</exec>