Merge branch 'master' into auto-publish

asaulys · Jul 19, 2008 · 1a78a14 · 1a78a14
2 parents b2da2c2 + 66e24cf
commit 1a78a14
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/_build.cfg b/_build.cfg
@@ -1,6 +1,6 @@
 project : {
    name : faxien
-   vsn  : "0.30.1.0"
+   vsn  : "0.31.0.0"
 },
 
 repositories : ["http://repo.martinjlogan.com/pub", "http://repo.erlware.org/pub"],
diff --git a/bin/epkg b/bin/epkg
@@ -6,7 +6,7 @@ PREFIX=$(cd $(dirname $(dirname $PROG)); pwd)
 
 #### Fill in values for these variables ####
 REL_NAME=faxien
-REL_VSN=0.30.1.0
+REL_VSN=0.31.0.0
 ERTS_VSN=5.6.2
 INVOCATION_SUFFIX="-s epkg cmdln_apply epkg $@ -s init stop -noshell -prefix $PREFIX"
 ###########################################

diff --git a/bin/faxien b/bin/faxien
@@ -6,7 +6,7 @@ PREFIX=$(cd $(dirname $(dirname $PROG)); pwd)
 
 #### Fill in values for these variables ####
 REL_NAME=faxien
-REL_VSN=0.30.1.0
+REL_VSN=0.31.0.0
 ERTS_VSN=5.6.2
 INVOCATION_SUFFIX="-s faxien cmdln_apply faxien $@ -s init stop -noshell -prefix $PREFIX"
 ###########################################

diff --git a/lib/epkg/ebin/epkg.app b/lib/epkg/ebin/epkg.app
@@ -5,7 +5,7 @@
   {description, "Manages local erlang/OTP packages. Faxien depends on this for local operations."},
 
   % The version of the applicaton
-  {vsn, "0.4.2.0"},
+  {vsn, "0.4.2.1"},
 
   % All modules used by the application.
   {modules,

diff --git a/lib/epkg/src/epkg_install.erl b/lib/epkg/src/epkg_install.erl
@@ -51,8 +51,8 @@ install_sinan_release(CWD, InstallationPath, IsLocalBoot) ->
 	[] ->
 	    io:format("~nNO release tarball will be installed. To generate a release~n" ++
 		      "tarball run 'sinan dist' in your project dir~n~n");
-	RelPaths -> 
-	   lists:foreach(fun(RelPath) -> install_release(RelPath, InstallationPath, IsLocalBoot) end, RelPaths)
+	AlteredRelPaths -> 
+	   lists:foreach(fun(RelPath) -> install_release(RelPath, InstallationPath, IsLocalBoot) end, AlteredRelPaths)
     end.
 
 %%--------------------------------------------------------------------

diff --git a/lib/faxien/ebin/faxien.app b/lib/faxien/ebin/faxien.app
@@ -5,7 +5,7 @@
   {description, "The erlang package management tool."},
 
   % The version of the applicaton
-  {vsn, "0.30.1.0"},
+  {vsn, "0.31.0.0"},
 
   % All modules used by the application. 
   {modules,

diff --git a/lib/faxien/src/fax_manage.erl b/lib/faxien/src/fax_manage.erl
@@ -295,7 +295,7 @@ upgrade_release(Repos, TargetErtsVsn, ReleaseName, IsLocalBoot, Options, Timeout
 	    handle_upgrade_release(Repos, TargetErtsVsn, ReleaseName, HighestLocalVsn,
 				   HighestRemoteVsn, IsLocalBoot, Force,Timeout);
 	{ok, {lower, HighestLocalVsn, HighestRemoteVsn, RemoteErtsVsn}} when ErtsPrompt == true ->
-	    case fax_util:ask_about_switching_target_ertsVsns(TargetErtsVsn, RemoteErtsVsn) of
+	    case fax_util:ask_about_switching_target_ertsVsns(ReleaseName, HighestRemoteVsn, TargetErtsVsn, RemoteErtsVsn) of
 		true  ->
 		    handle_upgrade_release(Repos, RemoteErtsVsn, ReleaseName, HighestLocalVsn,
 					   HighestRemoteVsn, IsLocalBoot, Force, Timeout);

diff --git a/lib/faxien/src/fax_publish.erl b/lib/faxien/src/fax_publish.erl
@@ -271,8 +271,8 @@ publish_apps_from_sinan(Repos, ProjectRootDir, BuildFlavor, Timeout) ->
     case epkg_util:ask_about_string_in_list(AppPaths, "Do you want to publish the app: ") of
 	[] ->
 	    io:format("~nNO apps will be published. To generate app packages run 'sinan'~nin your project dir~n~n");
-	AppPaths ->
-	    publish(Repos, AppPaths, Timeout)
+	AlteredAppPaths ->
+	    publish(Repos, AlteredAppPaths, Timeout)
     end.
 
 publish_dist_tarball_from_sinan(Repos, ProjectRootDir, BuildFlavor, Timeout) ->
@@ -289,6 +289,6 @@ publish_dist_tarball_from_sinan(Repos, ProjectRootDir, BuildFlavor, Timeout) ->
 	[] ->
 	    io:format("~nNO release tarball will be published. To generate a release~n" ++
 		      "tarball run 'sinan dist' in your project dir~n~n");
-	RelPaths -> 
-	    publish(Repos, RelPaths, Timeout)
+	AlteredRelPaths -> 
+	    publish(Repos, AlteredRelPaths, Timeout)
     end.