lib/autobuild/importer.rb in autobuild-1.4.4 vs lib/autobuild/importer.rb in autobuild-1.4.5
- old
+ new
@@ -50,11 +50,11 @@
# Performs the import of +package+
def import(package)
srcdir = package.srcdir
if File.directory?(srcdir)
if Autobuild.do_update
- Autobuild.progress "updating #{package.name}"
+ package.progress "updating %s"
update(package)
patch(package)
else
if Autobuild.verbose
puts " not updating #{package.name}"
@@ -64,11 +64,11 @@
elsif File.exists?(srcdir)
raise ConfigException, "#{srcdir} exists but is not a directory"
else
begin
- Autobuild.progress "checking out #{package.name}"
+ package.progress "checking out %s"
checkout(package)
patch(package)
rescue Autobuild::Exception
FileUtils.rm_rf package.srcdir
raise
@@ -103,10 +103,10 @@
f.readlines.collect { |path| path.rstrip }
end
end
if !patches.empty?
- Autobuild.progress "patching #{package.name}"
+ package.progress "patching %s"
end
# Do not be smart, remove all already applied patches
# and then apply the new ones
begin