mirror of
https://github.com/YunoHost-Apps/discourse_ynh.git
synced 2024-09-03 18:26:18 +02:00
Update app-4-fix-missing-git-repository.patch
This commit is contained in:
parent
6fca93e593
commit
fb9ee16f88
1 changed files with 13 additions and 13 deletions
|
@ -3,20 +3,20 @@ index 2b53a91eb3..eec55647d5 100644
|
||||||
--- a/lib/discourse.rb
|
--- a/lib/discourse.rb
|
||||||
+++ b/lib/discourse.rb
|
+++ b/lib/discourse.rb
|
||||||
@@ -439,7 +439,7 @@ module Discourse
|
@@ -439,7 +439,7 @@ module Discourse
|
||||||
$full_version ||=
|
def self.full_version
|
||||||
begin
|
@full_version ||= begin
|
||||||
git_cmd = 'git describe --dirty --match "v[0-9]*"'
|
git_cmd = 'git describe --dirty --match "v[0-9]*" 2> /dev/null'
|
||||||
- self.try_git(git_cmd, 'unknown')
|
- self.try_git(git_cmd, 'unknown')
|
||||||
+ self.try_git(git_cmd, Discourse::VERSION::STRING)
|
+ self.try_git(git_cmd, Discourse::VERSION::STRING)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -448,7 +448,7 @@ module Discourse
|
@@ -448,7 +448,7 @@ module Discourse
|
||||||
$last_commit_date ||=
|
def self.last_commit_date
|
||||||
begin
|
@last_commit_date ||= begin
|
||||||
git_cmd = 'git log -1 --format="%ct"'
|
git_cmd = 'git log -1 --format="%ct"'
|
||||||
- seconds = self.try_git(git_cmd, nil)
|
- seconds = self.try_git(git_cmd, nil)
|
||||||
+ seconds = '1563199245' # Note(decentral1se): Output from actual command in the v2.3.2 branch
|
+ seconds = '1563199245' # Note(decentral1se): Output from actual command in the v2.3.2 branch
|
||||||
seconds.nil? ? nil : DateTime.strptime(seconds, '%s')
|
seconds.nil? ? nil : DateTime.strptime(seconds, '%s')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue