Merge branch 'master' into describe-app

asaulys · Mar 25, 2008 · 240e8cd · 240e8cd
2 parents 01448ea + 6c5720d
commit 240e8cd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/lib/faxien/src/fax_cmdln.erl b/lib/faxien/src/fax_cmdln.erl
@@ -190,6 +190,9 @@ sanitize_error(Error) ->
 %% @doc Print out a custom error message to the user based on a sanitized error term.
 %% @end
 %%----------------------------------------------------------------------------
+print_error_specific_error_msg(no_publish_repos) ->
+    io:format(" - No publish repos have been configured. Add publish repos with 'faxien add-publish-repo <repo-name>'~n" ++
+	      "   Suggested repos are http://repo.erlware.org/writable and http://repo.martinjlogan.com/writable~n");
 print_error_specific_error_msg({unable_to_pull_from_repos, Msg}) ->
     io:format(" - " ++ Msg ++ "~n   Please request that the package compiled for your local~n" ++
 	      "   architecture be published to an accessible repository.~n");

diff --git a/lib/faxien/src/fax_publish.erl b/lib/faxien/src/fax_publish.erl
@@ -54,6 +54,8 @@
 %%     PackageDirPath = string() 
 %% @end
 %%--------------------------------------------------------------------
+publish([], RawPackageDirPath, Timeout) -> 
+    {error, no_publish_repos};
 publish(Repos, RawPackageDirPath, Timeout) -> 
     PackageDirPath = epkg_util:unpack_to_tmp_if_archive(RawPackageDirPath),
     case epkg_validation:validate_type(PackageDirPath) of

diff --git a/lib/faxien/src/faxien.erl b/lib/faxien/src/faxien.erl
@@ -574,7 +574,7 @@ fetch_app_help() ->
 %%--------------------------------------------------------------------
 publish(Repo, PackageDir, Timeout) -> 
     [A,B] = epkg_util:if_atom_or_integer_to_string([Repo, PackageDir]),
-    fax_publish:publish([A], B, Timeout, ?REQUEST_TIMEOUT).
+    fax_publish:publish([A], B, Timeout).
 
 %% @spec publish(PackageDir, Timeout) -> ok | {error, Reason}
 %% @equiv publish(Repos, PackageDir, Timeout)
@@ -586,8 +586,9 @@ publish(PackageDir, Timeout) when is_integer(Timeout); Timeout == infinity ->
 %% @spec publish(Repos PackageDir) -> ok | {error, Reason}
 %% @equiv publish(Repos AppDir, Timeout)
 publish(Repo, PackageDir) -> 
+    A = epkg_util:if_atom_or_integer_to_string(Repo),
     {ok, Timeout} = gas:get_env(faxien, request_timeout, ?REQUEST_TIMEOUT),
-    publish([Repo], PackageDir, Timeout).
+    publish([A], PackageDir, Timeout).
 
 %% @spec publish(AppDir) -> ok | {error, Reason}
 %% @equiv publish(DefaultRepos, AppDir)

diff --git a/lib/faxien/vsn.mk b/lib/faxien/vsn.mk
@@ -1 +1 @@
-FAXIEN_VSN=0.29.3.3
+FAXIEN_VSN=0.29.3.5
diff --git a/release/faxien/vsn.mk b/release/faxien/vsn.mk
@@ -1 +1 @@
-REL_VSN=0.29.3.3
+REL_VSN=0.29.3.5