[Pkg-puppet-devel] [facter] 44/46: Imported Upstream version 1.7.2
Stig Sandbeck Mathisen
ssm at debian.org
Sun Sep 1 10:47:34 UTC 2013
This is an automated email from the git hooks/post-receive script.
ssm pushed a commit to branch master
in repository facter.
commit 704608532a193599f60fe93b339d34b92765a3c0
Merge: fb5d04f 2027595
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date: Thu Jul 11 11:14:05 2013 +0200
Imported Upstream version 1.7.2
Rakefile | 6 +-
ext/build_defaults.yaml | 4 +-
ext/debian/changelog | 4 +-
ext/ips/facter.p5m | 4 +-
ext/osx/preflight | 204 ++++++++--------
ext/osx/prototype.plist | 2 +-
ext/redhat/facter.spec | 8 +-
lib/facter/domain.rb | 21 +-
lib/facter/ipaddress.rb | 10 +-
lib/facter/processor.rb | 4 +-
lib/facter/util/file_read.rb | 4 +
lib/facter/util/ip.rb | 2 +-
lib/facter/util/netmask.rb | 2 +-
lib/facter/util/resolution.rb | 2 +-
lib/facter/util/virtual.rb | 7 +-
lib/facter/version.rb | 2 +-
lib/facter/virtual.rb | 201 ++++++++--------
.../unit/interfaces/ifconfig_net_tools_1.60.txt | 19 ++
.../interfaces/ifconfig_net_tools_1.60.txt.em1 | 10 +
.../unit/interfaces/ifconfig_net_tools_1.60.txt.lo | 8 +
.../ipaddress/ifconfig_multiple_127_addresses.txt | 20 ++
.../unit/netmask/ifconfig_net_tools_1.60.txt | 19 ++
.../fixtures/unit/netmask/ifconfig_ubuntu_1204.txt | 16 ++
.../unit/util/virtual/invalid_unicode_dmi_entries | Bin 0 -> 74 bytes
spec/shared_formats/parses.rb | 3 +
spec/unit/domain_spec.rb | 243 +++++++++++---------
spec/unit/interfaces_spec.rb | 26 +++
spec/unit/ipaddress_spec.rb | 4 +
spec/unit/netmask_spec.rb | 29 +++
spec/unit/processor_spec.rb | 3 +-
spec/unit/util/resolution_spec.rb | 2 +-
spec/unit/util/virtual_spec.rb | 9 +
spec/unit/virtual_spec.rb | 7 +
33 files changed, 557 insertions(+), 348 deletions(-)
diff --cc ext/debian/changelog
index 4f38c72,1ef5c6c..7962a3a
--- a/ext/debian/changelog
+++ b/ext/debian/changelog
@@@ -1,8 -1,8 +1,8 @@@
- facter (1.7.0-1puppetlabs1) hardy lucid oneiric unstable sid wheezy lucid squeeze precise quantal; urgency=low
-facter (<%= @debversion %>) hardy lucid oneiric unstable sid wheezy lucid squeeze precise quantal; urgency=low
++facter (1.7.2-1puppetlabs1) hardy lucid oneiric unstable sid wheezy lucid squeeze precise quantal; urgency=low
- * Update to version <% @debversion %>
+ * Update to version
- -- Puppet Labs Release <info at puppetlabs.com> Mon, 15 Apr 2013 11:13:19 -0700
- -- Puppet Labs Release <info at puppetlabs.com> <%= Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")%>
++ -- Puppet Labs Release <info at puppetlabs.com> Wed, 10 Jul 2013 23:00:17 +0000
facter (1.7.0-0.1rc1puppetlabs1) hardy lucid oneiric unstable sid wheezy lucid squeeze precise; urgency=low
diff --cc ext/ips/facter.p5m
index ad57f43,0000000..cc4b2f6
mode 100644,000000..100644
--- a/ext/ips/facter.p5m
+++ b/ext/ips/facter.p5m
@@@ -1,10 -1,0 +1,10 @@@
- set name=pkg.fmri value=pkg://puppetlabs.com/application/facter@1.7.0,11.4.2-0
++set name=pkg.fmri value=pkg://puppetlabs.com/application/facter@1.7.2,11.4.2-0
+set name=pkg.summary value="Facter, a system inventory tool"
- set name=pkg.human-version value="1.7.0"
++set name=pkg.human-version value="1.7.2"
+set name=pkg.description value="You can prove anything with facts!"
+set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=org.opensolaris.consolidation value="puppet"
+set name=description value="You can prove anything with facts!"
+set name=variant.opensolaris.zone value=global value=nonglobal
+set name=variant.arch value=sparc value=i386
+license facter.license license="Apache v2.0"
diff --cc ext/osx/preflight
index 263bbb3,0000000..a431d21
mode 100644,000000..100644
--- a/ext/osx/preflight
+++ b/ext/osx/preflight
@@@ -1,241 -1,0 +1,241 @@@
+#!/bin/bash
+#
+# Make sure that old facter cruft is removed
+# This also allows us to downgrade facter as
+# it's more likely that installing old versions
+# over new will cause issues.
+#
+# ${3} is the destination volume so that this works correctly
+# when being installed to volumes other than the current OS.
+
+
+
+
+
+
+# remove libdir
+
+
- /bin/rm -Rf "${3}/facter/fqdn.rb"
-
- /bin/rm -Rf "${3}/facter/lsbdistid.rb"
-
- /bin/rm -Rf "${3}/facter/operatingsystemmajrelease.rb"
-
- /bin/rm -Rf "${3}/facter/version.rb"
-
- /bin/rm -Rf "${3}/facter/osfamily.rb"
-
- /bin/rm -Rf "${3}/facter/ipaddress6.rb"
++/bin/rm -Rf "${3}/facter/util/loader.rb"
+
- /bin/rm -Rf "${3}/facter/puppetversion.rb"
++/bin/rm -Rf "${3}/facter/util/uptime.rb"
+
- /bin/rm -Rf "${3}/facter/rubysitedir.rb"
++/bin/rm -Rf "${3}/facter/util/virtual.rb"
+
- /bin/rm -Rf "${3}/facter/iphostnumber.rb"
++/bin/rm -Rf "${3}/facter/util/netmask.rb"
+
- /bin/rm -Rf "${3}/facter/util/solaris_zones.rb"
++/bin/rm -Rf "${3}/facter/util/nothing_loader.rb"
+
- /bin/rm -Rf "${3}/facter/util/file_read.rb"
++/bin/rm -Rf "${3}/facter/util/macaddress.rb"
+
- /bin/rm -Rf "${3}/facter/util/confine.rb"
++/bin/rm -Rf "${3}/facter/util/cfpropertylist/README"
+
+/bin/rm -Rf "${3}/facter/util/cfpropertylist/THANKS"
+
- /bin/rm -Rf "${3}/facter/util/cfpropertylist/Rakefile"
++/bin/rm -Rf "${3}/facter/util/cfpropertylist/lib/rbCFTypes.rb"
+
+/bin/rm -Rf "${3}/facter/util/cfpropertylist/lib/rbCFPlistError.rb"
+
- /bin/rm -Rf "${3}/facter/util/cfpropertylist/lib/rbLibXMLParser.rb"
++/bin/rm -Rf "${3}/facter/util/cfpropertylist/lib/rbBinaryCFPropertyList.rb"
+
+/bin/rm -Rf "${3}/facter/util/cfpropertylist/lib/rbCFPropertyList.rb"
+
- /bin/rm -Rf "${3}/facter/util/cfpropertylist/lib/cfpropertylist.rb"
-
+/bin/rm -Rf "${3}/facter/util/cfpropertylist/lib/rbNokogiriParser.rb"
+
+/bin/rm -Rf "${3}/facter/util/cfpropertylist/lib/rbREXMLParser.rb"
+
- /bin/rm -Rf "${3}/facter/util/cfpropertylist/lib/rbBinaryCFPropertyList.rb"
++/bin/rm -Rf "${3}/facter/util/cfpropertylist/lib/cfpropertylist.rb"
+
- /bin/rm -Rf "${3}/facter/util/cfpropertylist/lib/rbCFTypes.rb"
++/bin/rm -Rf "${3}/facter/util/cfpropertylist/lib/rbLibXMLParser.rb"
+
+/bin/rm -Rf "${3}/facter/util/cfpropertylist/LICENSE"
+
- /bin/rm -Rf "${3}/facter/util/cfpropertylist/README"
-
- /bin/rm -Rf "${3}/facter/util/ip.rb"
-
- /bin/rm -Rf "${3}/facter/util/vlans.rb"
++/bin/rm -Rf "${3}/facter/util/cfpropertylist/Rakefile"
+
- /bin/rm -Rf "${3}/facter/util/resolution.rb"
++/bin/rm -Rf "${3}/facter/util/xendomains.rb"
+
- /bin/rm -Rf "${3}/facter/util/ec2.rb"
++/bin/rm -Rf "${3}/facter/util/wmi.rb"
+
- /bin/rm -Rf "${3}/facter/util/plist/generator.rb"
++/bin/rm -Rf "${3}/facter/util/file_read.rb"
+
- /bin/rm -Rf "${3}/facter/util/plist/parser.rb"
++/bin/rm -Rf "${3}/facter/util/registry.rb"
+
- /bin/rm -Rf "${3}/facter/util/composite_loader.rb"
++/bin/rm -Rf "${3}/facter/util/values.rb"
+
- /bin/rm -Rf "${3}/facter/util/cfpropertylist.rb"
++/bin/rm -Rf "${3}/facter/util/parser.rb"
+
- /bin/rm -Rf "${3}/facter/util/registry.rb"
++/bin/rm -Rf "${3}/facter/util/vlans.rb"
+
- /bin/rm -Rf "${3}/facter/util/memory.rb"
++/bin/rm -Rf "${3}/facter/util/processor.rb"
+
+/bin/rm -Rf "${3}/facter/util/plist.rb"
+
++/bin/rm -Rf "${3}/facter/util/ec2.rb"
++
+/bin/rm -Rf "${3}/facter/util/manufacturer.rb"
+
+/bin/rm -Rf "${3}/facter/util/fact.rb"
+
- /bin/rm -Rf "${3}/facter/util/collection.rb"
-
- /bin/rm -Rf "${3}/facter/util/netmask.rb"
-
- /bin/rm -Rf "${3}/facter/util/config.rb"
-
- /bin/rm -Rf "${3}/facter/util/xendomains.rb"
-
- /bin/rm -Rf "${3}/facter/util/processor.rb"
++/bin/rm -Rf "${3}/facter/util/resolution.rb"
+
- /bin/rm -Rf "${3}/facter/util/macosx.rb"
++/bin/rm -Rf "${3}/facter/util/collection.rb"
+
- /bin/rm -Rf "${3}/facter/util/wmi.rb"
++/bin/rm -Rf "${3}/facter/util/memory.rb"
+
- /bin/rm -Rf "${3}/facter/util/parser.rb"
++/bin/rm -Rf "${3}/facter/util/ip.rb"
+
- /bin/rm -Rf "${3}/facter/util/virtual.rb"
++/bin/rm -Rf "${3}/facter/util/solaris_zones.rb"
+
- /bin/rm -Rf "${3}/facter/util/values.rb"
++/bin/rm -Rf "${3}/facter/util/cfpropertylist.rb"
+
- /bin/rm -Rf "${3}/facter/util/uptime.rb"
++/bin/rm -Rf "${3}/facter/util/config.rb"
+
+/bin/rm -Rf "${3}/facter/util/monkey_patches.rb"
+
- /bin/rm -Rf "${3}/facter/util/nothing_loader.rb"
++/bin/rm -Rf "${3}/facter/util/plist/parser.rb"
+
- /bin/rm -Rf "${3}/facter/util/directory_loader.rb"
++/bin/rm -Rf "${3}/facter/util/plist/generator.rb"
+
- /bin/rm -Rf "${3}/facter/util/loader.rb"
++/bin/rm -Rf "${3}/facter/util/directory_loader.rb"
+
- /bin/rm -Rf "${3}/facter/util/macaddress.rb"
++/bin/rm -Rf "${3}/facter/util/confine.rb"
+
- /bin/rm -Rf "${3}/facter/ps.rb"
++/bin/rm -Rf "${3}/facter/util/composite_loader.rb"
+
- /bin/rm -Rf "${3}/facter/vlans.rb"
++/bin/rm -Rf "${3}/facter/util/macosx.rb"
+
- /bin/rm -Rf "${3}/facter/lsbdistrelease.rb"
++/bin/rm -Rf "${3}/facter/lsbrelease.rb"
+
- /bin/rm -Rf "${3}/facter/kernel.rb"
++/bin/rm -Rf "${3}/facter/hardwareisa.rb"
+
+/bin/rm -Rf "${3}/facter/zonename.rb"
+
- /bin/rm -Rf "${3}/facter/kernelversion.rb"
++/bin/rm -Rf "${3}/facter/lsbdistcodename.rb"
+
- /bin/rm -Rf "${3}/facter/ec2.rb"
++/bin/rm -Rf "${3}/facter/kernelmajversion.rb"
+
- /bin/rm -Rf "${3}/facter/lsbdistdescription.rb"
++/bin/rm -Rf "${3}/facter/uptime_seconds.rb"
++
++/bin/rm -Rf "${3}/facter/interfaces.rb"
+
+/bin/rm -Rf "${3}/facter/augeasversion.rb"
+
- /bin/rm -Rf "${3}/facter/ssh.rb"
++/bin/rm -Rf "${3}/facter/ipaddress6.rb"
+
- /bin/rm -Rf "${3}/facter/memory.rb"
++/bin/rm -Rf "${3}/facter/uptime.rb"
+
- /bin/rm -Rf "${3}/facter/lsbrelease.rb"
++/bin/rm -Rf "${3}/facter/virtual.rb"
+
- /bin/rm -Rf "${3}/facter/manufacturer.rb"
++/bin/rm -Rf "${3}/facter/operatingsystem.rb"
+
- /bin/rm -Rf "${3}/facter/kernelrelease.rb"
++/bin/rm -Rf "${3}/facter/physicalprocessorcount.rb"
+
- /bin/rm -Rf "${3}/facter/blockdevices.rb"
++/bin/rm -Rf "${3}/facter/ldom.rb"
+
- /bin/rm -Rf "${3}/facter/hardwaremodel.rb"
++/bin/rm -Rf "${3}/facter/blockdevices.rb"
+
- /bin/rm -Rf "${3}/facter/facterversion.rb"
++/bin/rm -Rf "${3}/facter/netmask.rb"
+
- /bin/rm -Rf "${3}/facter/zfs_version.rb"
++/bin/rm -Rf "${3}/facter/version.rb"
+
- /bin/rm -Rf "${3}/facter/lsbdistcodename.rb"
++/bin/rm -Rf "${3}/facter/uptime_days.rb"
+
- /bin/rm -Rf "${3}/facter/ldom.rb"
++/bin/rm -Rf "${3}/facter/uptime_hours.rb"
+
- /bin/rm -Rf "${3}/facter/architecture.rb"
++/bin/rm -Rf "${3}/facter/operatingsystemrelease.rb"
+
- /bin/rm -Rf "${3}/facter/netmask.rb"
++/bin/rm -Rf "${3}/facter/selinux.rb"
+
- /bin/rm -Rf "${3}/facter/filesystems.rb"
++/bin/rm -Rf "${3}/facter/kernelversion.rb"
+
- /bin/rm -Rf "${3}/facter/id.rb"
++/bin/rm -Rf "${3}/facter/macaddress.rb"
+
+/bin/rm -Rf "${3}/facter/xendomains.rb"
+
- /bin/rm -Rf "${3}/facter/uptime_seconds.rb"
++/bin/rm -Rf "${3}/facter/hostname.rb"
+
- /bin/rm -Rf "${3}/facter/hardwareisa.rb"
++/bin/rm -Rf "${3}/facter/rubyversion.rb"
+
- /bin/rm -Rf "${3}/facter/interfaces.rb"
++/bin/rm -Rf "${3}/facter/path.rb"
+
+/bin/rm -Rf "${3}/facter/zones.rb"
+
++/bin/rm -Rf "${3}/facter/operatingsystemmajrelease.rb"
++
++/bin/rm -Rf "${3}/facter/vlans.rb"
++
++/bin/rm -Rf "${3}/facter/application.rb"
++
+/bin/rm -Rf "${3}/facter/processor.rb"
+
- /bin/rm -Rf "${3}/facter/lsbmajdistrelease.rb"
++/bin/rm -Rf "${3}/facter/id.rb"
+
- /bin/rm -Rf "${3}/facter/macosx.rb"
++/bin/rm -Rf "${3}/facter/fqdn.rb"
+
- /bin/rm -Rf "${3}/facter/zpool_version.rb"
++/bin/rm -Rf "${3}/facter/ec2.rb"
+
- /bin/rm -Rf "${3}/facter/Cfkey.rb"
++/bin/rm -Rf "${3}/facter/architecture.rb"
+
- /bin/rm -Rf "${3}/facter/network.rb"
++/bin/rm -Rf "${3}/facter/ssh.rb"
++
++/bin/rm -Rf "${3}/facter/ipaddress.rb"
+
+/bin/rm -Rf "${3}/facter/uniqueid.rb"
+
- /bin/rm -Rf "${3}/facter/virtual.rb"
++/bin/rm -Rf "${3}/facter/manufacturer.rb"
+
- /bin/rm -Rf "${3}/facter/hostname.rb"
++/bin/rm -Rf "${3}/facter/kernel.rb"
+
- /bin/rm -Rf "${3}/facter/kernelmajversion.rb"
++/bin/rm -Rf "${3}/facter/kernelrelease.rb"
+
- /bin/rm -Rf "${3}/facter/domain.rb"
++/bin/rm -Rf "${3}/facter/timezone.rb"
+
- /bin/rm -Rf "${3}/facter/uptime.rb"
++/bin/rm -Rf "${3}/facter/puppetversion.rb"
+
- /bin/rm -Rf "${3}/facter/path.rb"
++/bin/rm -Rf "${3}/facter/rubysitedir.rb"
+
- /bin/rm -Rf "${3}/facter/uptime_hours.rb"
++/bin/rm -Rf "${3}/facter/facterversion.rb"
+
- /bin/rm -Rf "${3}/facter/application.rb"
++/bin/rm -Rf "${3}/facter/filesystems.rb"
+
- /bin/rm -Rf "${3}/facter/operatingsystemrelease.rb"
++/bin/rm -Rf "${3}/facter/lsbdistid.rb"
+
- /bin/rm -Rf "${3}/facter/rubyversion.rb"
++/bin/rm -Rf "${3}/facter/memory.rb"
+
- /bin/rm -Rf "${3}/facter/uptime_days.rb"
++/bin/rm -Rf "${3}/facter/lsbdistdescription.rb"
+
- /bin/rm -Rf "${3}/facter/ipaddress.rb"
++/bin/rm -Rf "${3}/facter/network.rb"
+
- /bin/rm -Rf "${3}/facter/timezone.rb"
++/bin/rm -Rf "${3}/facter/zpool_version.rb"
+
- /bin/rm -Rf "${3}/facter/physicalprocessorcount.rb"
++/bin/rm -Rf "${3}/facter/zfs_version.rb"
+
- /bin/rm -Rf "${3}/facter/macaddress.rb"
++/bin/rm -Rf "${3}/facter/domain.rb"
+
- /bin/rm -Rf "${3}/facter/selinux.rb"
++/bin/rm -Rf "${3}/facter/lsbdistrelease.rb"
+
- /bin/rm -Rf "${3}/facter/operatingsystem.rb"
++/bin/rm -Rf "${3}/facter/Cfkey.rb"
++
++/bin/rm -Rf "${3}/facter/osfamily.rb"
++
++/bin/rm -Rf "${3}/facter/ps.rb"
++
++/bin/rm -Rf "${3}/facter/hardwaremodel.rb"
++
++/bin/rm -Rf "${3}/facter/macosx.rb"
++
++/bin/rm -Rf "${3}/facter/lsbmajdistrelease.rb"
++
++/bin/rm -Rf "${3}/facter/iphostnumber.rb"
+
+/bin/rm -Rf "${3}/facter.rb"
+
+# remove bin files
+
+
+/bin/rm -Rf "${3}/facter"
+
+
+
+# remove old doc files
+/bin/rm -Rf "${3}/"
diff --cc ext/osx/prototype.plist
index 26138d1,e56659a..8860603
--- a/ext/osx/prototype.plist
+++ b/ext/osx/prototype.plist
@@@ -3,15 -3,15 +3,15 @@@
<plist version="1.0">
<dict>
<key>CFBundleIdentifier</key>
- <string><%= @title %></string>
+ <string></string>
<key>CFBundleShortVersionString</key>
- <string>1.7.0</string>
- <string><%= @version %></string>
++ <string>1.7.2</string>
<key>IFMajorVersion</key>
- <integer><%= @package_major_version %></integer>
+ <integer></integer>
<key>IFMinorVersion</key>
- <integer><%= @package_minor_version %></integer>
+ <integer></integer>
<key>IFPkgBuildDate</key>
- <date><%= @build_date %></date>
+ <date></date>
<key>IFPkgFlagAllowBackRev</key>
<false/>
<key>IFPkgFlagAuthorizationAction</key>
diff --cc ext/redhat/facter.spec
index e5aa4e5,1a04b1d..3ccbecf
--- a/ext/redhat/facter.spec
+++ b/ext/redhat/facter.spec
@@@ -7,8 -7,8 +7,8 @@@
%endif
# VERSION is subbed out during rake srpm process
- %global realversion 1.7.0
- %global rpmversion 1.7.0
-%global realversion <%= @version %>
-%global rpmversion <%= @rpmversion %>
++%global realversion 1.7.2
++%global rpmversion 1.7.2
Summary: Ruby module for collecting simple facts about a host operating system
Name: facter
@@@ -70,8 -70,8 +70,8 @@@ rm -rf %{buildroot
%changelog
- * Mon Apr 15 2013 Puppet Labs Release <info at puppetlabs.com> - 1:1.7.0-1
- - Build for 1.7.0
-* <%= Time.now.strftime("%a %b %d %Y") %> Puppet Labs Release <info at puppetlabs.com> - 1:<%= @rpmversion %>-<%= @rpmrelease %>
-- Build for <%= @version %>
++* Wed Jul 10 2013 Puppet Labs Release <info at puppetlabs.com> - 1:1.7.2-1
++- Build for 1.7.2
* Mon Apr 01 2013 Matthaus Owens <matthaus at puppetlabs.com> - 1:1.7.0-0.1rc1
- Add dependency on virt-what to facter for better virutalization detection
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git
More information about the Pkg-puppet-devel
mailing list