Version 1.2.0-dev.2.2
svn merge -c 32102 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
R=kasperl@google.com
Review URL: https://codereview.chromium.org//145123007
git-svn-id: http://dart.googlecode.com/svn/trunk@32110 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/runtime/bin/builtin.dart b/runtime/bin/builtin.dart
index cb3691a..99e80ca 100644
--- a/runtime/bin/builtin.dart
+++ b/runtime/bin/builtin.dart
@@ -216,14 +216,18 @@
// Relative URIs with scheme dart-ext should be resolved as if with no
// scheme.
resolved = baseUri.resolve(uri.path);
- var path = resolved.path;
if (resolved.scheme == 'package') {
// If we are resolving relative to a package URI we go directly to the
// file path and keep the dart-ext scheme. Otherwise, we will lose the
// package URI path part.
- path = _filePathFromPackageUri(resolved);
+ var path = _filePathFromPackageUri(resolved);
+ if (path.startsWith('http:')) {
+ throw "Native extensions not supported in "
+ "packages loaded over http: %path";
+ }
+ resolved = new Uri.file(path);
}
- resolved = new Uri(scheme: 'dart-ext', path: path);
+ resolved = new Uri(scheme: 'dart-ext', path: resolved.path);
} else {
resolved = baseUri.resolve(userString);
}
diff --git a/tools/VERSION b/tools/VERSION
index 7e48af8..b1c8afb 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
MINOR 2
PATCH 0
PRERELEASE 2
-PRERELEASE_PATCH 1
+PRERELEASE_PATCH 2
