Skip to content

Added option to load luadist as a module. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added option to load luadist as a module. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e86b29a
Added option to load luadist as a module.
pkulchenko Oct 26, 2013
9cacf85
Fixed an error thrown when `retrieve_pkg_info` fails.
pkulchenko Oct 26, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/depends.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ local function get_packages_to_install(pkg, installed, manifest, dependency_mani
end
end

if was_scm_version then pkg.was_scm_version = true end
if pkg and was_scm_version then pkg.was_scm_version = true end

-- check arch & type
if not err then
Expand Down
4 changes: 3 additions & 1 deletion luadist.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,9 @@ function apply_settings(variable, value)
end

-- Parse command line input and run the required command.
if not commands[arg[1]] and commands[arg[2]] then
if pcall(debug.getlocal, 4, 1) then
return commands -- return commands when used as module
elseif not commands[arg[1]] and commands[arg[2]] then
-- deploy_dir specified
return run_command(arg[1], arg[2], 3)
elseif commands[arg[1]] then
Expand Down