Commit e9543c27637c632a5c6232e5c557a3477c19919c

Thomas de Grivel 2025-04-07T15:55:37

fix rbpkg

diff --git a/lib/rbpkg.rb b/lib/rbpkg.rb
index 2e87969..74e289b 100644
--- a/lib/rbpkg.rb
+++ b/lib/rbpkg.rb
@@ -321,7 +321,7 @@ EOF
   end
 
   def self.libtool
-    if (result = `which glibtool`.strip) != ""
+    if (result = `which glibtool 2>/dev/null`.strip) != ""
       result
     else
       if File.exist?(result = "/usr/local/bin/libtool")
@@ -414,10 +414,8 @@ EOF
     dir
   end
 
-  def self.pull(repos)
-    repos.each do |name|
-      Repos.repo(name).pull()
-    end
+  def self.pull(repo, tree)
+    Repos.repo(repo, tree).pull()
   end
 
   def self.src_dir
@@ -452,7 +450,7 @@ EOF
     Repos.repo(repo, tree).uninstall()
   end
 
-  def self.upgrade(repo)
+  def self.upgrade(repo, tree)
     upgrade_self
     Repos.repo(repo, tree).upgrade()
   end
diff --git a/lib/rbpkg/repo.rb b/lib/rbpkg/repo.rb
index 1abfd2d..7c75dcd 100644
--- a/lib/rbpkg/repo.rb
+++ b/lib/rbpkg/repo.rb
@@ -391,7 +391,7 @@ class Rbpkg::Repo
 
   def pull
     verbose 3, "repo(#{name.inspect}).pull"
-    cmd! "cd #{sh_quote(src_dir!)} && git pull && git submodule update"
+    cmd! "cd #{sh_quote(src_dir!)} && git pull && git submodule init && git submodule update"
   end
 
   def pull_possible?