end
def markup(l)
- if l =~ /\[\[(\*|-)?(.*?)\]\]/
- l = $2
- end
- if l =~ /\[\[(.*?)\|(.*?)\]\]/
- l = $2
- end
+ l = l.gsub(/\[\[(.*?)\|(.*?)\]\]/, '\2')
+ l = l.gsub(/\[\[(\*|-)?(.*?)\]\]/, '\2')
return l
end
end
purp += " porterbox\n"
purp += "\n"
- purp += "See 'dchroot -l' for a list of available chroots.\n"
+ purp += "See 'dchroot -l' or 'schroot -l' for a list of available chroots.\n"
if nodeinfo['ldap'].has_key?('admin')
purp += "Please contact #{nodeinfo['ldap']['admin'][0]} for install requests,\n"
purp += "following the recommendations in <URL:http://dsa.debian.org/doc/install-req/>.\n"
unless vms.empty?
purp += "\nThe following virtual machines run on this system:\n"
vms.each do |node|
- purp += "\t#{node}"
+ purp += "\t- #{node}"
if allnodeinfo[node]['purpose']
purp += ":\n"
allnodeinfo[node]['purpose'].sort.each do |l|
l = markup(l)
- purp += "\t - " + l + "\n"
+ purp += "\t " + l + "\n"
end
else
purp += "\n"