[Xfce4-commits] <moka:master> Don't generate checksum on the archive anymore. Mirrorbrain does this now.

Nick Schermer noreply at xfce.org
Mon Jul 15 23:00:01 CEST 2013


Updating branch refs/heads/master
         to a475d50a9a89568225f56bea80ca1335e09f0ddc (commit)
       from db0844c8e2dc3a95db183aca1d83ed3ad3bd861f (commit)

commit a475d50a9a89568225f56bea80ca1335e09f0ddc
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Jul 15 22:58:13 2013 +0200

    Don't generate checksum on the archive anymore. Mirrorbrain does this now.

 examples/xfce/templates/project_feed_entry.erb   |    4 +-
 examples/xfce/templates/project_release_mail.erb |    4 +-
 lib/controllers/collections.rb                   |   11 ---
 lib/models/archive.rb                            |   86 +---------------------
 lib/models/collection.rb                         |    4 -
 lib/models/project.rb                            |    4 -
 lib/views/collection_release.haml                |    2 -
 7 files changed, 3 insertions(+), 112 deletions(-)

diff --git a/examples/xfce/templates/project_feed_entry.erb b/examples/xfce/templates/project_feed_entry.erb
index cae786a..0d797cb 100644
--- a/examples/xfce/templates/project_feed_entry.erb
+++ b/examples/xfce/templates/project_feed_entry.erb
@@ -3,9 +3,7 @@
   <a href="<%= release.download_url %>/<%= release.tarball_basename %>"><%= release.download_url %>/<%= release.tarball_basename %></a>
   <a href="<%= release.download_url %>/<%= release.tarball_basename %>.md5"><%= release.download_url %>/<%= release.tarball_basename %>.md5</a>
   <a href="<%= release.download_url %>/<%= release.tarball_basename %>.sha1"><%= release.download_url %>/<%= release.tarball_basename %>.sha1</a>
-
-  SHA1 checksum: <%= release.checksum(Digest::SHA1) %>
-   MD5 checksum: <%= release.checksum(Digest::MD5) %>
+  <a href="<%= release.download_url %>/<%= release.tarball_basename %>.sha256"><%= release.download_url %>/<%= release.tarball_basename %>.sha256</a>
 
 
 What is <%= release.project.name %>?
diff --git a/examples/xfce/templates/project_release_mail.erb b/examples/xfce/templates/project_release_mail.erb
index cf357e1..b3ecf9b 100644
--- a/examples/xfce/templates/project_release_mail.erb
+++ b/examples/xfce/templates/project_release_mail.erb
@@ -3,9 +3,7 @@
   <%= release.download_url %>/<%= release.tarball_basename %>
   <%= release.download_url %>/<%= release.tarball_basename %>.md5
   <%= release.download_url %>/<%= release.tarball_basename %>.sha1
-
-  SHA1 checksum: <%= release.checksum(Digest::SHA1) %>
-   MD5 checksum: <%= release.checksum(Digest::MD5) %>
+  <%= release.download_url %>/<%= release.tarball_basename %>.sha256
 
 
 What is <%= release.project.name %>?
diff --git a/lib/controllers/collections.rb b/lib/controllers/collections.rb
index 91cc4dc..384851e 100755
--- a/lib/controllers/collections.rb
+++ b/lib/controllers/collections.rb
@@ -76,17 +76,6 @@ module Moka
           view :collection_release
         end
 
-        app.get '/collection/:name/release/:release/update_fat_tarball_checksums' do
-          @collection = Collection.get(params[:name])
-
-          authentication_required(@collection)
-
-          @release = Collection::Release.new(@collection, params[:release])
-          @release.update
-
-          view :collection_release
-        end
-
         app.get '/collection/:name/new-release' do
           @collection = Collection.get(params[:name])
 
diff --git a/lib/models/archive.rb b/lib/models/archive.rb
index 21cc048..cd377e6 100755
--- a/lib/models/archive.rb
+++ b/lib/models/archive.rb
@@ -78,15 +78,6 @@ module Moka
 
         File.delete(link_filename) if File.file?(link_filename)
         File.link(link_target, link_filename)
-
-        checksum_files = project_release_checksum_filenames(project_release)
-        for filename in checksum_files
-          link_target = filename
-          link_filename = File.join(source_dir, File.basename(link_target))
-
-          File.delete(link_filename) if File.file?(link_filename)
-          File.link(link_target, link_filename)
-        end
       end
 
       def collection_release_remove_project_release(release, project_release)
@@ -132,17 +123,10 @@ module Moka
           File.makedirs(target_dir) unless File.directory?(target_dir)
           File.delete(fat_tarball) if File.file?(fat_tarball)
 
-          if system("cd #{release_dir} && flock --timeout=5 #{fat_tarball} tar cjf #{fat_tarball} #{source_dir}")
-            update_tarball_checksums(fat_tarball)
-          end
+          system("cd #{release_dir} && flock --timeout=5 #{fat_tarball} tar cjf #{fat_tarball} #{source_dir}")
         end
       end
 
-      def collection_release_update_checksums(release)
-        fat_tarball = collection_fat_tarball_filename(release)
-        update_tarball_checksums(fat_tarball)
-      end
-
       def classification_dir(classification)
         File.join(root_dir, 'src', classification.name)
       end
@@ -233,33 +217,9 @@ module Moka
           File.chmod(0664, target_file)
         end
 
-        update_tarball_checksums(target_file)
-
         project_branch_update(branch)
       end
 
-      def update_tarball_checksums(tarball)
-        basename = File.basename(tarball)
-
-        open("#{tarball}.md5", File::CREAT|File::TRUNC|File::RDWR) do |file|
-          begin
-            file.flock(File::LOCK_EX)
-            file.puts "#{Digest::MD5.file(tarball)}  #{basename}"
-          ensure
-            file.flock(File::LOCK_UN)
-          end
-        end
-
-        open("#{tarball}.sha1", File::CREAT|File::TRUNC|File::RDWR) do |file|
-          begin
-            file.flock(File::LOCK_EX)
-            file.puts "#{Digest::SHA1.file(tarball)}  #{basename}"
-          ensure
-            file.flock(File::LOCK_UN)
-          end
-        end
-      end
-
       def project_release_from_tarball(project, tarball)
         branch = project_tarball_branch(project, tarball)
         version = project_tarball_version(project, tarball)
@@ -314,58 +274,14 @@ module Moka
                   project_release_tarball_basename(release))
       end
 
-      def project_release_checksum_filenames(release)
-        tarball_basename = project_release_tarball_basename(release)
-        dirname = project_branch_dir(release.project, release.branch)
-
-        filenames = [
-          File.join(dirname, "#{tarball_basename}.md5"),
-          File.join(dirname, "#{tarball_basename}.sha1")
-        ]
-      end
-
       def project_release_delete(release)
         filename = project_release_tarball_filename(release)
 
         File.delete(filename) if File.file?(filename)
 
-        checksum_filenames = project_release_checksum_filenames(release)
-        for file in checksum_filenames
-          File.delete(file) if File.file?(file)
-        end
-
         project_branch_update(release.branch)
       end
 
-      def project_release_checksum(release, type)
-        result = nil
-
-        tarball_basename = project_release_tarball_basename(release)
-        branch_dir = project_branch_dir(release.project, release.branch)
-        basename = if type == Digest::MD5 then
-          "#{tarball_basename}.md5"
-        else
-          "#{tarball_basename}.sha1"
-        end
-
-        open(File.join(branch_dir, basename)) do |checksum_file|
-          begin
-            checksum_file.flock(File::LOCK_SH)
-            for line in checksum_file.readlines
-              checksum, tarball = line.split(' ')
-              if tarball == tarball_basename
-                result = checksum
-                break
-              end
-            end
-          ensure
-            checksum_file.flock(File::LOCK_UN)
-          end
-        end
-
-        result
-      end
-
       def project_releases(project)
         releases = []
 
diff --git a/lib/models/collection.rb b/lib/models/collection.rb
index 78fa458..b56fba8 100755
--- a/lib/models/collection.rb
+++ b/lib/models/collection.rb
@@ -56,10 +56,6 @@ module Moka
         def update
           Archive.instance.collection_release_update(self)
         end
-
-        def update_checksums
-          Archive.instance.collection_release_update_checksums(self)
-        end
         
         def release_url
           dir = Archive.instance.collection_release_dir(self)
diff --git a/lib/models/project.rb b/lib/models/project.rb
index 2f7758b..4d5a156 100755
--- a/lib/models/project.rb
+++ b/lib/models/project.rb
@@ -66,10 +66,6 @@ module Moka
           return version <=> other.version
         end
 
-        def checksum(type)
-          Archive.instance.project_release_checksum(self, type)
-        end
-
         def tarball_basename
           Archive.instance.project_release_tarball_basename(self)
         end
diff --git a/lib/views/collection_release.haml b/lib/views/collection_release.haml
index e6bdac3..595e1e0 100755
--- a/lib/views/collection_release.haml
+++ b/lib/views/collection_release.haml
@@ -1,8 +1,6 @@
 %h2 Administrative Tasks
 %p
   %a{:href => "/collection/#{@collection.name}/release/#{@release.version}/update_fat_tarball"} Regenerate fat tarball
-%p
-  %a{:href => "/collection/#{@collection.name}/release/#{@release.version}/update_fat_tarball_checksums"} Update fat tarball checksums
 
 %h2 Projects to include in the release
 %form{:method => "post"}


More information about the Xfce4-commits mailing list