Skip to content
This repository has been archived by the owner on Aug 29, 2018. It is now read-only.

Bug 1023588 - Build cartridge index from cache #4004

Merged
merged 1 commit into from Oct 26, 2013
Merged

Bug 1023588 - Build cartridge index from cache #4004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion node-util/bin/oo-admin-cartridge
View file
Open in desktop
Expand Up @@ -48,7 +48,7 @@ module OpenShift
end
end
when :list
return repository.to_s
return options.verbose ? repository.inspect : repository.to_s
when :erase
begin
repository.erase(options.name, options.version, options.cartridge_version)
Expand Down
3 changes: 1 addition & 2 deletions plugins/msg-node/mcollective/src/openshift.rb
View file
Open in desktop
Expand Up @@ -33,9 +33,8 @@ class Openshift<RPC::Agent
lock.flock(File::LOCK_EX)

@@cartridge_repository = ::OpenShift::Runtime::CartridgeRepository.instance
@@cartridge_repository.clear

Dir.glob(PathUtils.join('/usr/libexec/openshift/cartridges', '*')).each do |path|
Dir.glob(PathUtils.join(@@config.get('CARTRIDGE_BASE_PATH'), '*')).each do |path|
begin
manifest = @@cartridge_repository.install(path)
Log.instance.info("Installed cartridge (#{manifest.cartridge_vendor}, #{manifest.name}, #{manifest.version}, #{manifest.cartridge_version}) from #{path}")
Expand Down