dr 0.1.8 → 0.1.9

data/lib/dr/gitpackage.rb

@@ -120,7 +120,7 @@ module Dr
 
       orig_rev, curr_rev = update_from_origin branch
       log :info, "Branch #{branch.fg "blue"}, revision #{curr_rev[0..7].fg "blue"}"
-      unless @force
+      unless force
         history.each do |v|
           metadata = @repo.get_build_metadata @name, v
           if metadata.has_key?("revision") && metadata["revision"] == curr_rev
@@ -180,6 +180,15 @@ module Dr
             build_dir = "#{br}/#{build_dir_name}"
             FileUtils.cp_r src_dir, build_dir
 
+            # Make orig tarball
+            files = Dir["#{build_dir}/*"].map { |f| "\"#{File.basename f}\"" }.join " "
+            log :info, "Creating orig source tarball"
+            tar = "tar cz -C #{build_dir} --exclude=debian " +
+                  "-f #{br}/#{@name}_#{version.upstream}.orig.tar.gz " +
+                  "#{files}"
+            p tar
+            ShellCmd.new tar, :tag => "tar"
+
             apt = "sudo chroot #{br} apt-get update"
             deps = <<-EOS
 sudo chroot #{br} <<EOF
@@ -201,14 +210,6 @@ EOS
             log :info, "Installing build dependencies"
             ShellCmd.new deps, :tag => "mk-build-deps", :show_out => true
 
-            # Make orig tarball
-            files = Dir["#{build_dir}/*"].map { |f| "\"#{f}\"" }.join " "
-            log :info, "Creating orig source tarball"
-            tar = "tar cz -C #{build_dir} --exclude=debian " +
-                  "-f #{br}/#{@name}_#{version.upstream}.orig.tar.gz " +
-                  "#{files}"
-            ShellCmd.new tar, :tag => "tar"
-
             log :info, "Building the package"
             ShellCmd.new build, :tag => "debuild", :show_out => true
 

data/lib/dr/version.rb

@@ -1,3 +1,3 @@
 module Dr
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dr
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors: