@@ -45,28 +45,27 @@ def self.instances
4545
4646 def self . listcmd
4747 regex_fuzzy = /^(.*)--([\w -]+)?(%[^w]+)?$/
48- f = [ ]
4948 f = pkginfo ( "-a" , "-z" ) . split ( "\n " )
5049 packages = { }
5150 f . each do |line |
52- match = regex_fuzzy . match ( line . split [ 0 ] )
53- name = match . captures [ 0 ]
54- flavor = match . captures [ 1 ]
55- branch = match . captures [ 2 ]
56- if branch . nil?
57- pname = name
58- else
59- pname = name + branch
60- end
61- packages [ pname ] = { :name => pname , :flavor => flavor , :branch => branch , :ensure => "present" }
51+ match = regex_fuzzy . match ( line . split [ 0 ] )
52+ name = match . captures [ 0 ]
53+ flavor = match . captures [ 1 ]
54+ branch = match . captures [ 2 ]
55+ if branch . nil?
56+ pname = name
57+ else
58+ pname = name + branch
59+ end
60+ packages [ pname ] = { :name => pname , :flavor => flavor , :branch => branch , :ensure => "present" }
6261 end
6362 packages
6463 end
6564
6665 def install
6766 cmd = [ ]
6867
69- full_name = get_full_name ( action = "install" )
68+ full_name = get_full_name ( action = "install" )
7069
7170 cmd << '-r'
7271 cmd << install_options
@@ -80,7 +79,7 @@ def install
8079 end
8180 end
8281
83- def get_full_name ( action = "install" )
82+ def get_full_name ( action = "install" )
8483 # In case of a real update (i.e., the package already exists) then
8584 # pkg_add(8) can handle the flavors. However, if we're actually
8685 # installing with 'latest', we do need to handle the flavors. This is
@@ -122,14 +121,14 @@ def uninstall_options
122121
123122 def uninstall ( purge = false )
124123 if purge
125- pkgdelete "-c" , "-qq" , uninstall_options . flatten . compact , get_full_name ( action = "uninstall" )
124+ pkgdelete "-c" , "-qq" , uninstall_options . flatten . compact , get_full_name ( action = "uninstall" )
126125 else
127- pkgdelete uninstall_options . flatten . compact , get_full_name ( action = "uninstall" )
126+ pkgdelete uninstall_options . flatten . compact , get_full_name ( action = "uninstall" )
128127 end
129128 end
130129
131130 def purge
132- uninstall ( purge = true )
131+ uninstall ( purge = true )
133132 end
134133
135134 def flavor
0 commit comments