autoproj 1.12.3 → 1.12.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/bin/autoproj_bootstrap +2 -2
- data/lib/autoproj/osdeps.rb +2 -2
- data/lib/autoproj/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: 3fa89159dba1e3e5b0b0172970d60c23d6164f21
|
|
4
|
+
data.tar.gz: 0131d4b49f214fbd8df37f7383bdbb743266cac2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2724ec5bfb1f6c088a11f04ceca2151d2d1e46df749c706ea2c38903eddcd8bee6e928c1d00abbe88dce1ea77e1acaa12e2891042202f44d6f5a41f3ffd848f4
|
|
7
|
+
data.tar.gz: 1f86d09aa74d3680e4e632a159dadd31252e8966999b7bea0cdcc29ac997ba92609d848065579ccef15855693c626f1305b007f22619e1da4d214ed356a900de
|
data/bin/autoproj_bootstrap
CHANGED
|
@@ -1506,6 +1506,8 @@ fi
|
|
|
1506
1506
|
@definitions = definitions.merge(info.definitions) do |h, v1, v2|
|
|
1507
1507
|
if v1 != v2
|
|
1508
1508
|
root_dir ||= "#{Autoproj.root_dir}/"
|
|
1509
|
+
old = source_of(h).gsub(root_dir, '')
|
|
1510
|
+
new = info.source_of(h).gsub(root_dir, '')
|
|
1509
1511
|
|
|
1510
1512
|
# Warn if the new osdep definition resolves to a different
|
|
1511
1513
|
# set of packages than the old one
|
|
@@ -1518,8 +1520,6 @@ fi
|
|
|
1518
1520
|
osdep_h
|
|
1519
1521
|
end
|
|
1520
1522
|
if old_resolved != new_resolved
|
|
1521
|
-
old = source_of(h).gsub(root_dir, '')
|
|
1522
|
-
new = info.source_of(h).gsub(root_dir, '')
|
|
1523
1523
|
Autoproj.warn("osdeps definition for #{h}, previously defined in #{old} overridden by #{new}")
|
|
1524
1524
|
end
|
|
1525
1525
|
end
|
data/lib/autoproj/osdeps.rb
CHANGED
|
@@ -1043,6 +1043,8 @@ fi
|
|
|
1043
1043
|
@definitions = definitions.merge(info.definitions) do |h, v1, v2|
|
|
1044
1044
|
if v1 != v2
|
|
1045
1045
|
root_dir ||= "#{Autoproj.root_dir}/"
|
|
1046
|
+
old = source_of(h).gsub(root_dir, '')
|
|
1047
|
+
new = info.source_of(h).gsub(root_dir, '')
|
|
1046
1048
|
|
|
1047
1049
|
# Warn if the new osdep definition resolves to a different
|
|
1048
1050
|
# set of packages than the old one
|
|
@@ -1055,8 +1057,6 @@ fi
|
|
|
1055
1057
|
osdep_h
|
|
1056
1058
|
end
|
|
1057
1059
|
if old_resolved != new_resolved
|
|
1058
|
-
old = source_of(h).gsub(root_dir, '')
|
|
1059
|
-
new = info.source_of(h).gsub(root_dir, '')
|
|
1060
1060
|
Autoproj.warn("osdeps definition for #{h}, previously defined in #{old} overridden by #{new}")
|
|
1061
1061
|
end
|
|
1062
1062
|
end
|
data/lib/autoproj/version.rb
CHANGED