Commit Martin's patch for pub + lib_v2.

utils/pub/command_uploader.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library command_uploader;
 
+import 'dart:async';
 import 'dart:io';
 import 'dart:uri';
 
 import '../../pkg/args/lib/args.dart';
 import '../../pkg/path/lib/path.dart' as path;
 import 'entrypoint.dart';
 import 'exit_codes.dart' as exit_codes;
 import 'http.dart';
 import 'io.dart';
 import 'log.dart' as log;
@@ skipping 32 matching lines @@
     if (!['add', 'remove'].contains(command)) {
       log.error('Unknown uploader command "$command".');
       this.printUsage();
       exit(exit_codes.USAGE);
     } else if (commandOptions.rest.isEmpty) {
       log.error('No uploader given for "pub uploader $command".');
       this.printUsage();
       exit(exit_codes.USAGE);
     }
 
-    return new Future.immediate(null).chain((_) {
+    return new Future.immediate(null).then((_) {
       var package = commandOptions['package'];
       if (package != null) return new Future.immediate(package);
       return Entrypoint.load(path.current, cache)
-          .transform((entrypoint) => entrypoint.root.name);
-    }).chain((package) {
+          .then((entrypoint) => entrypoint.root.name);
+    }).then((package) {
       var uploader = commandOptions.rest[0];
       return oauth2.withClient(cache, (client) {
         if (command == 'add') {
           var url = server.resolve("/packages/${encodeUriComponent(package)}"
               "/uploaders.json");
           return client.post(url, fields: {"email": uploader});
         } else { // command == 'remove'
           var url = server.resolve("/packages/${encodeUriComponent(package)}"
               "/uploaders/${encodeUriComponent(uploader)}.json");
           return client.delete(url);
         }
       });
-    }).transform(handleJsonSuccess).transformException((e) {
+    }).then(handleJsonSuccess).catchError((e) {
       if (e is! PubHttpException) throw e;
       handleJsonError(e.response);
     });
   }
 }