Changeset 286

Timestamp:

07/07/06 00:22:40 (4 years ago)

Author:

vasi

Message:

don't notify about downloads that don't happen

Files:

• gtk-osx/trunk/scripts/gtk-osx/build/source.rb (modified) (4 diffs)

gtk-osx/trunk/scripts/gtk-osx/build/source.rb

@@ -25 +25 @@
         # it has been downloaded to.
         def download
-                puts "Downloading #{@package.name}"
-                @downloader.download
-                Growl.downloadComplete("#{@package.name} downloaded successfully")
+                if @downloader.need_download?
+                        puts "Downloading #{@package.name}"
+                        @downloader.download
+                        Growl.downloadComplete("#{@package.name} downloaded successfully")
+                end
         end
         
@@ -72 +74 @@
         end
         
+        def need_download?
+                not archive.file?
+        end
+        
         def download
-                arch = archive()
-                unless archive.file?
-                        archive.parent.mkpath
-                        cmd = "curl -o #{archive} #@uri"
-                        begin
-                                Script.run_script(cmd)
-                                raise unless archive.size > 4096
-                        rescue
-                                archive.unlink
-                                raise "Download failed!"
-                        end
+                archive.parent.mkpath
+                cmd = "curl -o #{archive} #@uri"
+                begin
+                        Script.run_script(cmd)
+                        raise unless archive.size > 4096
+                rescue
+                        archive.unlink
+                        raise "Download failed!"
                 end
         end
         
         def archive
-                filename = @uri.match(%r{([^/])*$}).to_s
-                return @config.dir('source') + filename
+                unless defined? @archive
+                        filename = @uri.match(%r{([^/])*$}).to_s
+                        @archive = @config.dir('source') + filename
+                end
+                return @archive
         end
         
@@ -105 +111 @@
         end
         
+        def need_download?
+                not archive.directory?
+        end
+        
         def download
-                arch = archive()
-                unless archive.directory?
-                        raise "Don't know CVS method '#@method'" \
-                                unless @repo.match(%r[^:pserver:])
-                        archive.parent.mkpath
-                        
-                        # Assume we've already logged in!
-                        cmd = "cvs -d #@repo -z3 co -d #{archive.basename} #@module"
-                        begin
-                                Env.chdir(archive.parent) { Script.run_script(cmd) }
-                        rescue
-                                archive.rmtree
-                                raise "Download failed!"
-                        end
+                raise "Don't know CVS method '#@method'" \
+                        unless @repo.match(%r[^:pserver:])
+                archive.parent.mkpath
+                
+                # Assume we've already logged in!
+                cmd = "cvs -d #@repo -z3 co -d #{archive.basename} #@module"
+                begin
+                        Env.chdir(archive.parent) { Script.run_script(cmd) }
+                rescue
+                        archive.rmtree
+                        raise "Download failed!"
                 end
         end
@@ -128 +135 @@
         
         def archive
-                filename = @module.gsub(%r[/], '_') + '.cvs'
-                return @config.dir('source') + filename
+                unless defined? @archive
+                        filename = @module.gsub(%r[/], '_') + '.cvs'
+                        @archive = @config.dir('source') + filename
+                end
+                return @archive
         end