Skip to content

Commit

Permalink
Merge 1f99490 into 20725d9
Browse files Browse the repository at this point in the history
  • Loading branch information
temka1234 committed Mar 12, 2015
2 parents 20725d9 + 1f99490 commit f96a058
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions lib/pkgcloud/google/storage/client/files.js
Expand Up @@ -39,15 +39,16 @@ exports.removeFile = function (container, file, callback) {
exports.upload = function (options) {
var self = this,
bucket = this._getBucket(options),
file = this._getFile(bucket, options);
file = this._getFile(bucket, options),
meta = options.meta || {};

// check for deprecated calling with a callback
if (typeof arguments[arguments.length - 1] === 'function') {
self.emit('log::warn', 'storage.upload no longer supports calling with a callback');
}

var proxyStream = through(),
writableStream = file.createWriteStream();
writableStream = file.createWriteStream(meta);

// we need a proxy stream so we can always return a file model
// via the 'success' event
Expand Down

0 comments on commit f96a058

Please sign in to comment.