ref: refs/heads/master
commit 1c473a5bd2412a907202f28574a92f39cefa42d2
Author: Ladislav Slezak
Date: Thu Oct 29 18:16:20 2009 +0100
no need to rename package task
Rake::PackageTask is created only when needed, thus
renaming 'package' task to 'package-local' is not needed.
---
webservice-tasks/lib/tasks/package-local.rake | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/webservice-tasks/lib/tasks/package-local.rake b/webservice-tasks/lib/tasks/package-local.rake
index f59239e..8c337a6 100644
--- a/webservice-tasks/lib/tasks/package-local.rake
+++ b/webservice-tasks/lib/tasks/package-local.rake
@@ -1,22 +1,12 @@
require 'rake'
-require 'rake/packagetask'
require 'fileutils'
-require "#{File.dirname(__FILE__)}/rake_rename_task"
-
-# temporary name for the package task backup
-PACKAGE_BACKUP = '*__package_task_backup__*'
# name of the package (base file name)
PACKAGE_NAME = 'www'
# target directory for the package file
PACKAGE_DIR = 'package'
-# backup the current existing :package task
-if Rake::Task.task_defined?(:package)
- Rake::Task[:package].rename(PACKAGE_BACKUP)
-end
-
def remove_package_dir
# remove the old package directory
www_dir = File.join(Dir.pwd, PACKAGE_DIR, PACKAGE_NAME)
@@ -58,6 +48,8 @@ end
# create new package task
def create_package_task
+ require 'rake/packagetask'
+
Rake::PackageTask.new(PACKAGE_NAME, :noversion) do |p|
p.need_tar_bz2 = true
p.package_dir = PACKAGE_DIR
@@ -113,9 +105,4 @@ desc "Force a rebuild of the package files"
# is always removed before creating a new package
task :repackage => :package
-# restore the original :package task
-if Rake::Task.task_defined?(PACKAGE_BACKUP)
- Rake::Task[PACKAGE_BACKUP].rename(:package)
-end
-
# vim: ft=ruby
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org