Commit 35e0357c6e9671a2fbce1ba6e5615db972e13109

Thomas de Grivel 2023-02-25T23:16:09

rbpkg_ci

diff --git a/lib/rbpkg/log.rb b/lib/rbpkg/log.rb
index cf108e3..4426772 100644
--- a/lib/rbpkg/log.rb
+++ b/lib/rbpkg/log.rb
@@ -62,7 +62,7 @@ EOF
     def status=(sym)
       status_dir = File.dirname(status_path)
       cmd! "mkdir -p #{sh_quote(status_dir)}" unless File.directory?(status_dir)
-      File.write(status_path, sym.to_s)
+      File.write(status_path, "#{sym.to_s}\n")
       @status = sym
     end
 
diff --git a/lib/rbpkg/repo.rb b/lib/rbpkg/repo.rb
index 8cb9166..d7f490e 100644
--- a/lib/rbpkg/repo.rb
+++ b/lib/rbpkg/repo.rb
@@ -48,11 +48,8 @@ class Rbpkg::Repo
     sh_ci_profile = sh_quote(ci_dir + '/etc/profile')
     if File.directory?(ci_dir)
       Rbpkg::Log.add("rbpkg_ci.#{name}.upgrade")
-      if cmd "export RBPKG_DIR=#{sh_ci_dir} && . #{sh_ci_profile} && rbpkg checkout #{sh_quote(commit)} #{sh_name} && rbpkg upgrade #{sh_name}"
-        Rbpkg::Log.ok("rbpkg_ci.#{name}.upgrade")
-      else
-        Rbpkg::Log.ko("rbpkg_ci.#{name}.upgrade")
-      end
+      cmd! "export RBPKG_DIR=#{sh_ci_dir} && . #{sh_ci_profile} && rbpkg checkout #{sh_quote(commit)} #{sh_name} && rbpkg upgrade #{sh_name}"
+      Rbpkg::Log.ok("rbpkg_ci.#{name}.upgrade")
     end
     Rbpkg::Log.add("rbpkg_ci.#{name}.install")
     cmd! "#{sh_quote(Rbpkg.dir)}/bin/rbpkg_bootstrap -f #{sh_quote(ci_dir)}"