Index: sdk/lib/_internal/pub/lib/src/pubspec.dart |
diff --git a/sdk/lib/_internal/pub/lib/src/pubspec.dart b/sdk/lib/_internal/pub/lib/src/pubspec.dart |
index 6781a5c1df07afb8a298c3c1ea921cda03fabeff..d37f833ee13c0ec363db8a3b990ebd42747bba3d 100644 |
--- a/sdk/lib/_internal/pub/lib/src/pubspec.dart |
+++ b/sdk/lib/_internal/pub/lib/src/pubspec.dart |
@@ -96,9 +96,6 @@ class Pubspec { |
List<PackageDep> get dependencies { |
if (_dependencies != null) return _dependencies; |
_dependencies = _parseDependencies('dependencies'); |
- if (_devDependencies == null) { |
- _checkDependencyOverlap(_dependencies, devDependencies); |
- } |
return _dependencies; |
} |
List<PackageDep> _dependencies; |
@@ -107,9 +104,7 @@ class Pubspec { |
List<PackageDep> get devDependencies { |
if (_devDependencies != null) return _devDependencies; |
_devDependencies = _parseDependencies('dev_dependencies'); |
- if (_dependencies == null) { |
- _checkDependencyOverlap(dependencies, _devDependencies); |
- } |
+ _checkDependencyOverlap(dependencies, _devDependencies); |
Bob Nystrom
2015/01/28 23:42:00
What do you think about calling this from both dep
nweiz
2015/01/29 01:26:22
Done.
|
return _devDependencies; |
} |
List<PackageDep> _devDependencies; |
@@ -334,7 +329,7 @@ class Pubspec { |
Iterable<PackageDep> dependencyOverrides, |
VersionConstraint sdkConstraint, |
Iterable<Iterable<TransformerConfig>> transformers, |
- Map fields, SourceRegistry sources}) |
+ Map fields, SourceRegistry sources}) |
: _version = version, |
_dependencies = dependencies == null ? null : dependencies.toList(), |
_devDependencies = devDependencies == null ? null : |
@@ -491,8 +486,9 @@ class Pubspec { |
pubspecPath = path.fromUri(_location); |
} |
- return _sources[sourceName].parseDescription( |
+ var desc = _sources[sourceName].parseDescription( |
pubspecPath, descriptionNode.value, fromLockFile: false); |
+ return desc; |
Bob Nystrom
2015/01/28 23:42:00
Temp code, I assume.
nweiz
2015/01/29 01:26:22
Done.
|
}); |
dependencies.add(new PackageDep( |