lib/autobuild/importer.rb in autobuild-1.12.0 vs lib/autobuild/importer.rb in autobuild-1.12.1
- old
+ new
@@ -299,18 +299,26 @@
last_error = nil
retry_count = 0
package.progress_start "updating %s"
begin
- update(package,only_local)
+ did_update = update(package,only_local)
execute_post_hooks(package)
+ message = if did_update == false
+ Autobuild.color('already up-to-date', :green)
+ else
+ Autobuild.color('updated', :yellow)
+ end
+
rescue Interrupt
+ message = Autobuild.color('interrupted', :red)
if last_error
raise last_error
else raise
end
rescue ::Exception => original_error
+ message = Autobuild.color('update failed', :red)
last_error = original_error
# If the package is patched, it might be that the update
# failed because we needed to unpatch first. Try it out
#
# This assumes that importing data with conflict will
@@ -334,16 +342,14 @@
retry_count = update_retry_count(original_error, retry_count)
raise if !retry_count
package.message "update failed in #{package.importdir}, retrying (#{retry_count}/#{self.retry_count})"
retry
ensure
- package.progress_done "updated %s"
+ package.progress_done "#{message} %s"
end
patch(package)
package.updated = true
- rescue Interrupt
- raise
rescue Autobuild::Exception => e
fallback(e, package, :import, package)
end
def perform_checkout(package, options = Hash.new)