bosh_cli 0.19.2 → 0.19.3

data/lib/cli/commands/release.rb

@@ -107,11 +107,25 @@ module Bosh::Cli::Command
       end
     end
 
+    def get_remote_packages(manifest_yaml, remote_release)
+      remote_packages_sha1 = match_remote_packages(manifest_yaml)
+
+      # Older directors may not match packages. For such
+      # cases we select packages from the existing release.
+      if remote_packages_sha1.size == 0 && remote_release
+        remote_packages_sha1 = remote_release["packages"].map do |pkg|
+          pkg["sha1"]
+        end
+      end
+      remote_packages_sha1
+    end
+
     def upload_manifest(manifest_path)
       manifest = load_yaml_file(manifest_path)
       remote_release = get_remote_release(manifest["name"]) rescue nil
       remote_jobs = remote_release["jobs"] if remote_release
-      remote_packages_sha1 = match_remote_packages(File.read(manifest_path))
+      remote_packages_sha1 = get_remote_packages(File.read(manifest_path),
+                                                 remote_release)
       blobstore = release.blobstore
       tmpdir = Dir.mktmpdir
 
@@ -153,7 +167,8 @@ module Bosh::Cli::Command
         end
 
         if repack
-          remote_packages_sha1 = match_remote_packages(tarball.manifest)
+          remote_packages_sha1 = get_remote_packages(tarball.manifest,
+                                                     remote_release)
 
           say("Checking if can repack release for faster upload...")
           repacked_path = tarball.repack(remote_jobs, remote_packages_sha1)

data/lib/cli/commands/stemcell.rb

@@ -94,7 +94,7 @@ module Bosh::Cli::Command
       response = @http_client.get(PUBLIC_STEMCELL_INDEX_URL)
       status_code = response.http_header.status_code
       if status_code != HTTP::Status::OK
-        raise "Received HTTP #{status_code} from #{index_url}."
+        err("Received HTTP #{status_code} from #{PUBLIC_STEMCELL_INDEX_URL}.")
       end
       YAML.load(response.body)
     end

data/lib/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Cli
-    VERSION = "0.19.2"
+    VERSION = "0.19.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 0.19.2
+  version: 0.19.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -317,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1152730120913906678
+      hash: 3443692206202112856
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1152730120913906678
+      hash: 3443692206202112856
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23