buildtasks 0.0.3 → 0.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/buildtasks/git_buildpackage/tasks.rb +12 -3
- data/lib/buildtasks/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 23eaf60ec0b87d7301075cdd8d8fd1ae83c495a5
|
|
4
|
+
data.tar.gz: 6b9bebfc6efec80deb7f4b99709c27e926ab75a8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 02b5373852bd82509252793a3449443f9bc14701036c3ca61a426b90ed067ce85011fbfcb7804783da109b87d1f1ed7124862b82938335ce26dbca5abd9f4849
|
|
7
|
+
data.tar.gz: 4599087186e724688620ef8ba72ef4e1baf2d0d624ebaca23db1da76347c1e4d95a2ec68a9f430259e5238480a5e21fbd5c17b45d8e1f46eeaf1dd136e33c486
|
|
@@ -86,9 +86,10 @@ module BuildTasks
|
|
|
86
86
|
desc "Build packages"
|
|
87
87
|
task :build => [:clone, :patch, :deps] do
|
|
88
88
|
in_git_dir do
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
89
|
+
cmd = gbp_cmd + ["--git-ignore-branch",
|
|
90
|
+
"--git-ignore-new",
|
|
91
|
+
"--git-builder=#{BUILD_CMD}"]
|
|
92
|
+
sh(*cmd)
|
|
92
93
|
end
|
|
93
94
|
end
|
|
94
95
|
|
|
@@ -115,6 +116,14 @@ module BuildTasks
|
|
|
115
116
|
def in_git_dir
|
|
116
117
|
cd(git_dir) { yield }
|
|
117
118
|
end
|
|
119
|
+
|
|
120
|
+
def gbp_cmd
|
|
121
|
+
path = `which git-buildpackage`
|
|
122
|
+
return [path.strip] if $CHILD_STATUS.success?
|
|
123
|
+
path = `which gbp`
|
|
124
|
+
return [path.strip, "buildpackage"] if $?.success?
|
|
125
|
+
raise "git-buildpackage command not found"
|
|
126
|
+
end
|
|
118
127
|
end
|
|
119
128
|
end
|
|
120
129
|
end
|
data/lib/buildtasks/version.rb
CHANGED