facter 1.6.12 → 1.6.13.rc1

data/LICENSE

@@ -1,6 +1,6 @@
 Facter - Host Fact Detection and Reporting
 
-Copyright 2011 Puppet Labs Inc
+Copyright 2005-2012 Puppet Labs Inc
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -10,7 +10,6 @@ require 'rubygems'
 require 'rspec'
 require 'rspec/core/rake_task'
 require 'rake'
-require 'yaml'
 
 begin
   require 'rcov'
@@ -20,29 +19,35 @@ end
 Dir['tasks/**/*.rake'].each { |t| load t }
 Dir['ext/packaging/tasks/**/*'].sort.each { |t| load t }
 
-begin
-  @build_defaults ||= YAML.load_file('ext/build_defaults.yaml')
+build_defs_file = 'ext/build_defaults.yaml'
+if File.exist?(build_defs_file)
+  begin
+    require 'yaml'
+    @build_defaults ||= YAML.load_file(build_defs_file)
+  rescue Exception => e
+    STDERR.puts "Unable to load yaml from #{build_defs_file}:"
+    STDERR.puts e
+  end
   @packaging_url  = @build_defaults['packaging_url']
   @packaging_repo = @build_defaults['packaging_repo']
-rescue
-  STDERR.puts "Unable to read the packaging repo info from ext/build_defaults.yaml"
-end
+  raise "Could not find packaging url in #{build_defs_file}" if @packaging_url.nil?
+  raise "Could not find packaging repo in #{build_defs_file}" if @packaging_repo.nil?
 
-namespace :package do
-  desc "Bootstrap packaging automation, e.g. clone into packaging repo"
-  task :bootstrap do
-    if File.exist?("ext/#{@packaging_repo}")
-      puts "It looks like you already have ext/#{@packaging_repo}. If you don't like it, blow it away with package:implode."
-    else
-      cd 'ext' do
-        %x{git clone #{@packaging_url}}
+  namespace :package do
+    desc "Bootstrap packaging automation, e.g. clone into packaging repo"
+    task :bootstrap do
+      if File.exist?("ext/#{@packaging_repo}")
+        puts "It looks like you already have ext/#{@packaging_repo}. If you don't like it, blow it away with package:implode."
+      else
+        cd 'ext' do
+          %x{git clone #{@packaging_url}}
+        end
       end
     end
-  end
-
-  desc "Remove all cloned packaging automation"
-  task :implode do
-    rm_rf "ext/#{@packaging_repo}"
+    desc "Remove all cloned packaging automation"
+    task :implode do
+      rm_rf "ext/#{@packaging_repo}"
+    end
   end
 end
 

data/ext/build_defaults.yaml

@@ -2,12 +2,12 @@
 packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
 packaging_repo: 'packaging'
 default_cow: 'base-squeeze-i386.cow'
-cows: 'base-lucid-amd64.cow base-lucid-i386.cow base-natty-amd64.cow base-natty-i386.cow base-oneiric-amd64.cow base-oneiric-i386.cow base-precise-amd64.cow base-precise-i386.cow base-sid-amd64.cow base-sid-i386.cow base-squeeze-amd64.cow base-squeeze-i386.cow base-testing-amd64.cow base-testing-i386.cow base-wheezy-i386.cow'
+cows: 'base-lucid-i386.cow base-natty-i386.cow base-oneiric-i386.cow base-precise-i386.cow base-sid-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-unstable-i386.cow base-wheezy-i386.cow'
 pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
 gpg_name: 'info@puppetlabs.com'
 gpg_key: '4BD6EC30'
-sign_tar: TRUE
+sign_tar: FALSE
 # a space separated list of mock configs
 final_mocks: 'pl-5-i386 pl-5-x86_64 pl-6-i386 pl-6-x86_64 fedora-15-i386 fedora-15-x86_64 fedora-16-i386 fedora-16-x86_64 fedora-17-i386 fedora-17-x86_64'
 rc_mocks: 'pl-5-i386-dev pl-5-x86_64-dev pl-6-i386-dev pl-6-x86_64-dev fedora-15-i386-dev fedora-15-x86_64-dev fedora-16-i386-dev fedora-16-x86_64-dev fedora-17-i386-dev fedora-17-x86_64-dev'
@@ -18,3 +18,6 @@ build_dmg: TRUE
 apt_host: 'burji.puppetlabs.com'
 apt_repo_url: 'http://apt.puppetlabs.com'
 apt_repo_path: '/opt/repository/incoming'
+ips_repo: '/var/pkgrepo'
+ips_store: '/opt/repository'
+ips_host: 'solaris-11-ips-repo.acctest.dc1.puppetlabs.net'

data/ext/debian/control

@@ -2,13 +2,13 @@ Source: facter
 Section: ruby
 Priority: optional
 Maintainer: Puppet Labs <info@puppetlabs.com>
-Build-Depends: cdbs, debhelper (>> 7), ruby1.8 | ruby1.9.1, libopenssl-ruby1.8 | libopenssl-ruby1.9.1
+Build-Depends: cdbs, debhelper (>> 7), ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.8 | libopenssl-ruby1.9.1, rdoc
 Standards-Version: 3.9.1
 Homepage: http://www.puppetlabs.com
 
 Package: facter
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 (>= 1.8.5) | ruby1.9.1, libopenssl-ruby1.8 | libopenssl-ruby1.9.1, dmidecode, pciutils
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.8 | libopenssl-ruby1.9.1, dmidecode, pciutils
 Description: Ruby module for collecting simple facts about a host operating system
  Some of the facts are preconfigured, such as the hostname and the operating
  system. Additional facts can be added through simple Ruby scripts.

data/ext/debian/docs

@@ -1,2 +1 @@
-CHANGELOG
 README.md

data/ext/debian/rules

@@ -3,7 +3,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/buildcore.mk
 
-LIBDIR=$(shell /usr/bin/ruby1.8 -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')
+LIBDIR=$(shell /usr/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendordir"]')
+BINDIR=$(shell /usr/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["bindir"]')
 
 binary-install/facter::
-	 /usr/bin/ruby1.8 install.rb --sitelibdir=$(LIBDIR) --destdir=$(CURDIR)/debian/$(cdbs_curpkg) --quick --no-rdoc
+	 /usr/bin/ruby install.rb --sitelibdir=$(LIBDIR) --bindir=$(BINDIR) --ruby=/usr/bin/ruby --destdir=$(CURDIR)/debian/$(cdbs_curpkg) --quick

data/ext/ips/facter.p5m.erb

@@ -0,0 +1,10 @@
+set name=pkg.fmri value=pkg://puppetlabs.com/application/<%=@name%>@<%=@ipsversion%>
+set name=pkg.summary value="<%=@summary%>"
+set name=pkg.human-version value="<%=@version%>"
+set name=pkg.description value="<%=@description%>"
+set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=org.opensolaris.consolidation value="puppet"
+set name=description value="<%=@description%>"
+set name=variant.opensolaris.zone value=global value=nonglobal
+set name=variant.arch value=sparc value=i386
+license facter.license license="Apache v2.0"

data/ext/ips/rules

@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+
+LIBDIR=$(shell /usr/bin/ruby18 -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')
+DESTDIR=$(CURDIR)/pkg/ips/proto
+
+binary-install/facter::
+	/usr/bin/ruby18 install.rb --destdir=$(DESTDIR) --bindir=/usr/bin --sbindir=/usr/sbin --sitelibdir=$(LIBDIR) --mandir=/usr/share/man

data/ext/ips/transforms

@@ -0,0 +1,18 @@
+<transform file dir link hardlink path=usr/share/man/.+(/.+)? -> default facet.doc.man true>
+<transform file path=usr/share/man/.+(/.+)? -> add restart_fmri svc:/application/man-index:default>
+
+# drop user
+<transform dir path=usr$->drop>
+<transform dir path=usr/bin$->drop>
+<transform dir path=usr/sbin$->drop>
+<transform dir path=usr/share$->drop>
+<transform dir path=usr/share/man$->drop>
+<transform dir path=usr/ruby$->drop>
+<transform dir path=usr/ruby/1.8$->drop>
+<transform dir path=usr/ruby/1.8/lib$->drop>
+<transform dir path=usr/ruby/1.8/lib/ruby$->drop>
+<transform dir path=usr/ruby/1.8/lib/ruby/1.8$->drop>
+
+
+# saner dependencies
+<transform depend -> edit fmri "@[^ \t\n\r\f\v]*" "">

data/ext/osx/prototype.plist.erb

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<pkg-info version="1.0">
+<plist version="1.0">
 <dict>
 	<key>CFBundleIdentifier</key>
 	<string><%= @title %></string>
@@ -35,4 +35,4 @@
 	<key>IFPkgFlagUpdateInstalledLanguages</key>
 	<false/>
 </dict>
-</pkg-info>
+</plist>

data/ext/packaging/README-Solaris.md

@@ -0,0 +1,117 @@
+## Create self signed certificate
+
+- Generate the key pair
+
+        | keytool -genkey -keyalg RSA -alias selfsigned -keystore keystore.jks -storepass password -validity 360 -keysize 2048
+
+
+- Extract Certificate
+
+        | keytool -export -rfc -keystore keystore.jks -storepass password -alias selfsigned -file mycert.pem
+
+- Extract Cert Key to PEM format
+
+        | keytool -importkeystore -srcstoretype JKS -srckeystore keystore.jks -deststoretype PKCS12 -destkeystore mykey.der
+        | openssl pkcs12 -in mykey.der -nodes -out mykey.pem
+
+## For installation.
+
+- Check the publishers
+
+        | pkg publisher
+        solaris                               origin   online   http://pkg.oracle.com/solaris/release/
+
+- Add puppetlabs.com as a publisher
+
+        | pkg set-publisher -p http://solaris-11-ips-repo.acctest.dc1.puppetlabs.net puppetlabs.com
+
+- Check that we have it correct
+
+        | pkg publisher
+        solaris                               origin   online   http://pkg.oracle.com/solaris/release/
+        puppetlabs.com                        origin   online   http://solaris-11-ips-repo.acctest.dc1.puppetlabs.net/
+
+- Verify that puppetlabs.com was set correctly,
+
+        | pkg publisher puppetlabs.com
+                Publisher: puppetlabs.com
+                    Alias:
+               Origin URI: http://solaris-11-ips-repo.acctest.dc1.puppetlabs.net/
+                  SSL Key: None
+                 SSL Cert: None
+              Client UUID: 37084c4a-fdc6-11e1-832b-8800273bd610
+          Catalog Updated: September 13, 2012 08:31:25 PM
+                  Enabled: Yes
+         Signature Policy: verify
+
+- Try installing puppet
+
+        | pkg install puppet
+        Creating Plan |
+        pkg install: Chain was rooted in an untrusted self-signed certificate.
+          The package involved is:pkg://puppetlabs.com/system/management/puppet@3.0.0,5.11-6.192:20120913T212942Z
+
+- We have two choices here, first, to ignore the signature policy for both publisher and image
+
+        | pkg set-publisher --set-property=signature-policy=ignore  puppetlabs.com
+        | pkg publisher puppetlabs.com
+                Publisher: puppetlabs.com
+                    Alias: 
+               Origin URI: http://solaris-11-ips-repo.acctest.dc1.puppetlabs.net/
+                  SSL Key: None
+                 SSL Cert: None
+              Client UUID: 140bb5c8-fe62-11e1-af70-8800273bd610
+          Catalog Updated: September 14, 2012 05:11:45 PM 
+                  Enabled: Yes
+         Signature Policy: ignore
+        | pkg set-property signature-policy ignore
+        | pkg install puppet
+
+- Or trust the self signed certificate from puppetlabs.com (this certificate needs to be published in our web site)
+
+        | pkg set-publisher --approve-ca-cert /root/mycert.pem puppetlabs.com
+
+- Verify that approve cert went well.
+
+        | pkg publisher puppetlabs.com
+
+                Publisher: puppetlabs.com
+                    Alias: 
+               Origin URI: http://solaris-11-ips-repo.acctest.dc1.puppetlabs.net/
+                  SSL Key: None
+                 SSL Cert: None
+              Client UUID: 37084c4a-fdc6-11e1-832b-8800273bd610
+          Catalog Updated: September 13, 2012 08:31:25 PM 
+             Approved CAs: 791b5791a81e9c2eb3fb9f84f4f86f8ea6fcd672
+                  Enabled: Yes
+         Signature Policy: verify
+
+        | pkg install puppet
+
+- Checking about information on the package (See the human readable version string)
+
+        | pkg info -r puppet
+                  Name: system/management/puppet
+               Summary: Puppet, an automated configuration management tool
+           Description: Puppet, an automated configuration management tool
+              Category: System/Administration and Configuration
+                 State: Not installed
+             Publisher: puppetlabs.com
+               Version: 3.0.0 (3.0.0-rc6)
+         Build Release: 5.11
+                Branch: 6.170
+        Packaging Date: September 14, 2012 06:11:05 PM 
+                  Size: 2.43 MB
+                  FMRI: pkg://puppetlabs.com/system/management/puppet@3.0.0,5.11-6.170:20120914T181105Z
+
+- Check license
+
+        | pkg info -r --license puppet
+           Puppet - Automating Configuration Management.
+
+           Copyright (C) 2005-2012 Puppet Labs Inc
+
+
+- Reference
+
+http://docs.oracle.com/cd/E19963-01/html/820-6572/managepkgs.html

data/ext/packaging/tasks/00_utils.rb

@@ -107,16 +107,10 @@ end
 
 def get_ips_version
   if File.exists?('.git')
-    desc = %x{git describe}.chomp
+    desc = %x{git describe}.chomp.split(/[.-]/)
+    commits = %x{git log --oneline --no-merges | wc -l}.chomp.strip
     osrelease = %x{uname -r}.chomp
-    varr = desc.gsub(/[a-zA-Z]+/,' ').split(' ')
-    ver = varr[0].gsub('-', '')
-    res = case varr[1]
-    when /(\d+)-(\d+)/    # rcX-build
-      "#{ver},#{osrelease}-#{$1}.#{$2}"
-    else
-      "#{ver},#{osrelease}"
-    end
+    "%s.%s.%s,#{osrelease}-%s" % [ desc[0],desc[1], desc[2], commits]
   else
     get_pwd_version
   end
@@ -240,3 +234,49 @@ def x(v)
   print %x[#{v}]
 end
 
+def ask_yes_or_no
+  answer = STDIN.gets.downcase.chomp
+  return TRUE if answer =~ /^y$|^yes$/
+  return FALSE if answer =~ /^n$|^no$/
+  puts "Nope, try something like yes or no or y or n, etc:"
+  ask_yes_or_no
+end
+
+def handle_method_failure(method, args)
+  STDERR.puts "There was an error running the method #{method} with the arguments:"
+  args.each { |param, arg| STDERR.puts "\t#{param} => #{arg}\n" }
+  STDERR.puts "The rake session is paused. Would you like to retry #{method} with these args and continue where you left off? [y,n]"
+  if ask_yes_or_no
+    send(method, args)
+  else
+    exit 1
+  end
+end
+
+def invoke_task(task, args=nil)
+  Rake::Task[task].reenable
+  Rake::Task[task].invoke(args)
+end
+
+def confirm_ship(files)
+  STDOUT.puts "The following files have been built and are ready to ship:"
+  files.each { |file| STDOUT.puts "\t#{file}\n" }
+  STDOUT.puts "Ship these files??"
+  ask_yes_or_no
+end
+
+def boolean_value(var)
+  return TRUE if (var == TRUE || ( var.is_a?(String) && var.downcase == 'true' ))
+  FALSE
+end
+
+def git_tag(version)
+  begin
+    sh "git tag -s -u #{@gpg_key} -m '#{version}' #{version}"
+  rescue Exception => e
+    STDERR.puts e
+    STDERR.puts "Unable to tag repo at #{version}"
+    exit 1
+  end
+end
+

data/ext/packaging/tasks/10_setupvars.rake

@@ -25,24 +25,29 @@ rescue
 end
 
 begin
-  @pkg_defaults   ||= YAML.load_file('ext/build_defaults.yaml')
-  @default_cow    = ENV['COW']          || @pkg_defaults['default_cow']
-  @cows           = ENV['COW']          || @pkg_defaults['cows']
-  @pbuild_conf    = ENV['PBUILDCONF']   || @pkg_defaults['pbuild_conf']
-  @packager       = ENV['PACKAGER']     || @pkg_defaults['packager']
-  @sign_tar       = ENV['SIGN_TAR']     || @pkg_defaults['sign_tar']
-  @final_mocks    = ENV['MOCK']         || @pkg_defaults['final_mocks']
-  @rc_mocks       = ENV['MOCK']         || @pkg_defaults['rc_mocks']
-  @gpg_name       = ENV['GPG_NAME']     || @pkg_defaults['gpg_name']
-  @gpg_key        = ENV['GPG_KEY']      || @pkg_defaults['gpg_key']
-  @build_gem      = ENV['GEM']          || @pkg_defaults['build_gem']
-  @build_dmg      = ENV['DMG']          || @pkg_defaults['build_dmg']
-  @yum_host       = @pkg_defaults['yum_host']
-  @yum_repo_path  = @pkg_defaults['yum_repo_path']
-  @apt_host       = @pkg_defaults['apt_host']
-  @apt_repo_url   = @pkg_defaults['apt_repo_url']
-  @apt_repo_path  = @pkg_defaults['apt_repo_path']
-  @ips_repo       = @pkg_defaults['ips_repo']
+  @pkg_defaults    ||= YAML.load_file('ext/build_defaults.yaml')
+  @sign_tar        = boolean_value( ENV['SIGN_TAR'] || @pkg_defaults['sign_tar']  )
+  @build_gem       = boolean_value( ENV['GEM']      || @pkg_defaults['build_gem'] )
+  @build_dmg       = boolean_value( ENV['DMG']      || @pkg_defaults['build_dmg'] )
+  @build_ips       = boolean_value( ENV['IPS']      || @pkg_defaults['build_ips'] )
+  @default_cow     = ENV['COW']          || @pkg_defaults['default_cow']
+  @cows            = ENV['COW']          || @pkg_defaults['cows']
+  @pbuild_conf     = ENV['PBUILDCONF']   || @pkg_defaults['pbuild_conf']
+  @packager        = ENV['PACKAGER']     || @pkg_defaults['packager']
+  @final_mocks     = ENV['MOCK']         || @pkg_defaults['final_mocks']
+  @rc_mocks        = ENV['MOCK']         || @pkg_defaults['rc_mocks']
+  @gpg_name        = ENV['GPG_NAME']     || @pkg_defaults['gpg_name']
+  @gpg_key         = ENV['GPG_KEY']      || @pkg_defaults['gpg_key']
+  @certificate_pem = ENV['CERT_PEM']     || @pkg_defaults['certificate_pem']
+  @privatekey_pem  = ENV['PRIVATE_PEM']  || @pkg_defaults['privatekey_pem']
+  @yum_host        = @pkg_defaults['yum_host']
+  @yum_repo_path   = @pkg_defaults['yum_repo_path']
+  @apt_host        = @pkg_defaults['apt_host']
+  @apt_repo_url    = @pkg_defaults['apt_repo_url']
+  @apt_repo_path   = @pkg_defaults['apt_repo_path']
+  @ips_repo        = @pkg_defaults['ips_repo']
+  @ips_store       = @pkg_defaults['ips_store']
+  @ips_host        = @pkg_defaults['ips_host']
 rescue
   STDERR.puts "There was an error loading the packaging defaults from the 'ext/build_defaults.yaml' file."
   exit 1

data/ext/packaging/tasks/apple.rake

@@ -32,7 +32,7 @@ task :setup do
   @package_minor_version = @version.split('.')[1] +
                            @version.split('.')[2].split('-')[0].split('rc')[0]
   @pm_restart            = 'None'
-  @build_date            = timestamp
+  @build_date            = Time.new.strftime("%Y-%m-%dT%H:%M:%SZ")
   @apple_bindir          = '/usr/bin'
   @apple_sbindir         = '/usr/sbin'
   @apple_libdir          = '/usr/lib/ruby/site_ruby/1.8'
@@ -81,7 +81,7 @@ def build_dmg
   dmg_file          = "#{@title}.dmg"
   package_file      = "#{@title}.pkg"
   pm_extra_args     = '--verbose --no-recommend --no-relocate'
-  package_target_os = '10.5'
+  package_target_os = '10.4'
 
   # Build .pkg file
   system("sudo #{PACKAGEMAKER} --root #{@working_tree['working']} \
@@ -182,7 +182,7 @@ def pack_source
   end
 end
 
-if @build_dmg or @build_dmg == 'TRUE' or @build_dmg == 'true'
+if @build_dmg
   namespace :package do
     desc "Task for building an Apple Package"
     task :apple => [:setup] do

data/ext/packaging/tasks/deb.rake

@@ -5,17 +5,18 @@ def pdebuild args
   set_cow_envs(cow)
   begin
     sh "pdebuild --configfile #{@pbuild_conf} --buildresult #{results_dir} --pbuilder cowbuilder -- --override-config --othermirror=\"deb #{@apt_repo_url} #{ENV['DIST']} main dependencies #{devel_repo}\" --basepath /var/cache/pbuilder/#{cow}/"
-  rescue
-    STDERR.puts "Something went wrong. Hopefully the backscroll or #{results_dir}/#{@name}_#{@debversion}.build file has a clue."
-    exit 1
+  rescue Exception => e
+    puts e
+    handle_method_failure('pdebuild', args)
   end
 end
 
 def update_cow(cow, is_rc = nil)
   ENV['FOSS_DEVEL'] = is_rc
+  ENV['PATH'] = "/usr/sbin:#{ENV['PATH']}"
   set_cow_envs(cow)
   begin
-    sh "sudo cowbuilder --update --override-config --configfile #{@pbuild_conf} --basepath /var/cache/pbuilder/#{cow} --distribution #{ENV['DIST']} --architecture #{ENV['ARCH']}"
+    sh "sudo -E /usr/sbin/cowbuilder --update --override-config --configfile #{@pbuild_conf} --basepath /var/cache/pbuilder/#{cow} --distribution #{ENV['DIST']} --architecture #{ENV['ARCH']}"
   rescue
     STDERR.puts "Couldn't update the cow #{cow}. Perhaps you don't have sudo?"
     exit 1
@@ -49,19 +50,16 @@ task :build_deb, :deb_command, :cow, :devel do |t,args|
   work_dir  = get_temp
   dest_dir  = "#{@build_root}/pkg/deb/#{cow.split('-')[1] unless cow.nil?}"
   check_tool(deb_build)
+  update_cow(cow)
   mkdir_p dest_dir
   deb_args  = { :work_dir => work_dir, :cow => cow, :devel => devel}
   Rake::Task[:prep_deb_tars].reenable
   Rake::Task[:prep_deb_tars].invoke(work_dir)
   cd "#{work_dir}/#{@name}-#{@debversion}" do
     mv 'ext/debian', '.'
-    begin
-      send(deb_build, deb_args)
-      cp FileList["#{work_dir}/*.deb", "#{work_dir}/*.dsc", "#{work_dir}/*.changes", "#{work_dir}/*.debian.tar.gz", "#{work_dir}/*.orig.tar.gz"], dest_dir
-      rm_rf "#{work_dir}/#{@name}-#{@debversion}"
-    rescue
-      STDERR.puts "Something went wrong. Hopefully the backscroll or #{work_dir}/#{@name}_#{@debversion}.build file has a clue."
-    end
+    send(deb_build, deb_args)
+    cp FileList["#{work_dir}/*.deb", "#{work_dir}/*.dsc", "#{work_dir}/*.changes", "#{work_dir}/*.debian.tar.gz", "#{work_dir}/*.orig.tar.gz"], dest_dir
+    rm_rf "#{work_dir}/#{@name}-#{@debversion}"
     rm_rf work_dir
   end
 end