lib/autobuild/import/darcs.rb in autobuild-1.8.3 vs lib/autobuild/import/darcs.rb in autobuild-1.9.0.b1
- old
+ new
@@ -20,30 +20,31 @@
@get = [*options[:get]]
end
private
- def update(package,only_local=false) # :nodoc:
- if only_local
- Autobuild.warn "The importer #{self.class} does not support local updates, skipping #{self}"
+ def update(package, options = Hash.new) # :nodoc:
+ if options[:only_local]
+ package.warn "%s: the darcs importer does not support local updates, skipping"
return
end
if !File.directory?( File.join(package.srcdir, '_darcs') )
- raise ConfigException.new(package, 'import'), "#{package.srcdir} is not a Darcs repository"
+ raise ConfigException.new(package, 'import'),
+ "#{package.srcdir} is not a Darcs repository"
end
- Subprocess.run(package, :import, @program,
- 'pull', '--all', "--repodir=#{package.srcdir}", '--set-scripts-executable', @source, *@pull)
+ package.run(:import, @program,
+ 'pull', '--all', "--repodir=#{package.srcdir}", '--set-scripts-executable', @source, *@pull, retry: true)
end
def checkout(package) # :nodoc:
basedir = File.dirname(package.srcdir)
unless File.directory?(basedir)
FileUtils.mkdir_p(basedir)
end
- Subprocess.run(package, :import, @program,
- 'get', '--set-scripts-executable', @source, package.srcdir, *@get)
+ package.run(:import, @program,
+ 'get', '--set-scripts-executable', @source, package.srcdir, *@get, retry: true)
end
end
# Returns the Darcs importer which will get the source from the Darcs repository
# +source+. The allowed values in +options+ are described in DarcsImporter.new.