Hello community,
here is the log from the commit of package zmd-inventory
checked in at Thu Jun 29 03:00:31 CEST 2006.
--------
--- zmd-inventory/zmd-inventory.changes 2006-06-17 00:53:20.000000000 +0200
+++ zmd-inventory/zmd-inventory.changes 2006-06-28 02:23:46.000000000 +0200
@@ -1,0 +2,12 @@
+Tue Jun 27 23:12:07 CEST 2006 - thunder@suse.de
+
+- New drop (r31266):
+- Use 'hwinfo --all --nowpa' instead of 'hwinfo --reallyall' (#186923).
+
+-------------------------------------------------------------------
+Tue Jun 20 23:42:28 CEST 2006 - thunder@suse.de
+
+- New drop (r30734):
+- Wait 30000 milliseconds for hwinfo, up from 3000.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd-inventory.spec ++++++
--- /var/tmp/diff_new_pack.cQo5Ks/_old 2006-06-29 03:00:17.000000000 +0200
+++ /var/tmp/diff_new_pack.cQo5Ks/_new 2006-06-29 03:00:17.000000000 +0200
@@ -14,7 +14,7 @@
BuildRequires: hwinfo-devel log4net mono-basic mono-data-sqlite mono-devel update-desktop-files zmd-devel
URL: http://www.novell.com
Version: 7.1.1.0
-Release: 10
+Release: 11
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %name-%version.tar.bz2
@@ -59,6 +59,12 @@
%{_prefix}/lib/zmd/modules/*
%changelog -n zmd-inventory
+* Tue Jun 27 2006 - thunder@suse.de
+- New drop (r31266):
+- Use 'hwinfo --all --nowpa' instead of 'hwinfo --reallyall' (#186923).
+* Tue Jun 20 2006 - thunder@suse.de
+- New drop (r30734):
+- Wait 30000 milliseconds for hwinfo, up from 3000.
* Sat Jun 17 2006 - thunder@suse.de
- New source drop (r30603):
- Deal correctly with network interfaces which don't have any IPs
++++++ zmd-inventory-7.1.1.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-inventory-7.1.1.0/src/ChangeLog new/zmd-inventory-7.1.1.0/src/ChangeLog
--- old/zmd-inventory-7.1.1.0/src/ChangeLog 2006-06-16 22:46:37.000000000 +0200
+++ new/zmd-inventory-7.1.1.0/src/ChangeLog 2006-06-27 22:46:28.000000000 +0200
@@ -1,3 +1,35 @@
+2006-06-27 Dan Mills
+
+ * InventoryModule.cs: Hook into the inventory-enabled property for
+ the registration info provider.
+
+ * InventoryCapability.cs:
+ * NUInventory.cs:
+
+ Use 'inventory-enabled' as the preference to enable all inventory (instead of hardware and software separately).
+
+ * Scanner.cs (HWInfoParser): Use 'hwinfo --all --nowpa' instead of
+ 'hwinfo --reallyall'.
+
+2006-06-23 Dan Mills
+
+ * NUInventory.cs (IsEnabled):
+ * InventoryCapability.cs (IsEnabled):
+
+ Implement property.
+
+ * InventoryRefresh.cs (IsEnabled): Abstract property. Used to
+ determine whether to add a schedule for inventory collection.
+
+ * InventoryModule.cs (ModuleInit): Hook into the Changed event for
+ the hardware-inventory-enabled preference, to add/remove the
+ registration info provider.
+
+2006-06-20 Dan Mills
+
+ * Scanner.cs (HWInfoParser): Set hwinfo timeout to 30000
+ milliseconds.
+
2006-06-16 Dan Mills
* NUInventory.cs (MakeXmlRpcNet): Deal with network devices that
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-inventory-7.1.1.0/src/InventoryCapability.cs new/zmd-inventory-7.1.1.0/src/InventoryCapability.cs
--- old/zmd-inventory-7.1.1.0/src/InventoryCapability.cs 2006-05-31 19:43:07.000000000 +0200
+++ new/zmd-inventory-7.1.1.0/src/InventoryCapability.cs 2006-06-27 21:08:09.000000000 +0200
@@ -44,6 +44,10 @@
private static readonly ILog log = LogManager.GetLogger (typeof (SoftwareInventoryCapability));
+ protected override bool IsEnabled {
+ get { return PreferenceManager.GetBoolean ("inventory-enabled"); }
+ }
+
public SoftwareInventoryCapability () : base () {
this.name = "Software Inventory";
this.refreshPref = "refresh-interval-software";
@@ -145,6 +149,10 @@
private static readonly ILog log = LogManager.GetLogger (typeof (HardwareInventoryCapability));
+ protected override bool IsEnabled {
+ get { return PreferenceManager.GetBoolean ("inventory-enabled"); }
+ }
+
public HardwareInventoryCapability () : base () {
this.name = "Hardware Inventory";
this.refreshPref = "refresh-interval-hardware";
@@ -246,6 +254,10 @@
private static readonly ILog log = LogManager.GetLogger (typeof (SystemInventoryCapability));
+ protected override bool IsEnabled {
+ get { return PreferenceManager.GetBoolean ("inventory-enabled"); }
+ }
+
public SystemInventoryCapability () : base () {
this.name = "System Inventory";
this.refreshPref = "refresh-interval-system";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-inventory-7.1.1.0/src/InventoryModule.cs new/zmd-inventory-7.1.1.0/src/InventoryModule.cs
--- old/zmd-inventory-7.1.1.0/src/InventoryModule.cs 2006-05-31 19:43:07.000000000 +0200
+++ new/zmd-inventory-7.1.1.0/src/InventoryModule.cs 2006-06-27 22:45:58.000000000 +0200
@@ -10,7 +10,11 @@
ZenService.RegisterCapability ("software-inventory", typeof (SoftwareInventoryCapability));
ZenService.RegisterCapability ("hardware-inventory", typeof (HardwareInventoryCapability));
ZenService.RegisterCapability ("system-inventory", typeof (SystemInventoryCapability));
- ZenService.RegistrationInfoProvider += HardwareInventoryCapability.RegistrationInfoProvider;
+
+ PreferenceManager.LookupPreference ("inventory-enabled").Changed += ToggleInfoProvider;
+ if (PreferenceManager.GetBoolean ("inventory-enabled")) {
+ ZenService.RegistrationInfoProvider += HardwareInventoryCapability.RegistrationInfoProvider;
+ }
Novell.Zenworks.Zmd.ServiceManager.ServiceAdded += NUInventoryManager.ServiceAddedHandler;
Novell.Zenworks.Zmd.ServiceManager.ServiceRemoved += NUInventoryManager.ServiceRemovedHandler;
@@ -20,5 +24,13 @@
GettextCatalog.GetString ("Software and Hardware inventory module for Linux"),
"GPL");
}
+
+ public static void ToggleInfoProvider (object o, EventArgs e) {
+ if (PreferenceManager.GetBoolean ("hardware-inventory-enabled")) {
+ ZenService.RegistrationInfoProvider += HardwareInventoryCapability.RegistrationInfoProvider;
+ } else {
+ ZenService.RegistrationInfoProvider -= HardwareInventoryCapability.RegistrationInfoProvider;
+ }
+ }
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-inventory-7.1.1.0/src/InventoryRefresh.cs new/zmd-inventory-7.1.1.0/src/InventoryRefresh.cs
--- old/zmd-inventory-7.1.1.0/src/InventoryRefresh.cs 2006-05-31 19:43:07.000000000 +0200
+++ new/zmd-inventory-7.1.1.0/src/InventoryRefresh.cs 2006-06-23 21:47:55.000000000 +0200
@@ -29,6 +29,8 @@
get { return refreshPref; }
}
+ protected abstract bool IsEnabled { get; }
+
public InventoryRefresh () {
this.name = "Inventory";
this.refreshPref = "refresh-interval";
@@ -62,7 +64,7 @@
protected void StartDelayedRefresh (object o, EventArgs args) {
- if (!PreferenceManager.GetBoolean ("inventory-enabled"))
+ if (!this.IsEnabled)
return;
lock (this) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-inventory-7.1.1.0/src/NUInventory.cs new/zmd-inventory-7.1.1.0/src/NUInventory.cs
--- old/zmd-inventory-7.1.1.0/src/NUInventory.cs 2006-06-16 22:36:05.000000000 +0200
+++ new/zmd-inventory-7.1.1.0/src/NUInventory.cs 2006-06-27 21:07:00.000000000 +0200
@@ -48,6 +48,10 @@
private static readonly ILog log = LogManager.GetLogger (typeof (NUHardwareInventory));
+ protected override bool IsEnabled {
+ get { return PreferenceManager.GetBoolean ("inventory-enabled"); }
+ }
+
public NUHardwareInventory () : base () {
this.name = "Novell Update Service hardware inventory";
this.refreshPref = "refresh-interval-hardware";
@@ -285,6 +289,10 @@
private static readonly ILog log = LogManager.GetLogger (typeof (NUSoftwareInventory));
private static readonly string ChecksumFile = BuildConfig.LOCALSTATEDIR + "/lib/zmd/nu-software-inventory-checksum";
+ protected override bool IsEnabled {
+ get { return PreferenceManager.GetBoolean ("inventory-enabled"); }
+ }
+
public NUSoftwareInventory () : base () {
this.name = "Novell Update Service software inventory";
this.refreshPref = "refresh-interval-software";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-inventory-7.1.1.0/src/Scanner.cs new/zmd-inventory-7.1.1.0/src/Scanner.cs
--- old/zmd-inventory-7.1.1.0/src/Scanner.cs 2006-06-09 22:36:00.000000000 +0200
+++ new/zmd-inventory-7.1.1.0/src/Scanner.cs 2006-06-27 23:32:30.000000000 +0200
@@ -62,16 +62,16 @@
private Section[] sections;
public HWInfoParser () {
- ProcessStartInfo info = new ProcessStartInfo ("/usr/sbin/hwinfo", "--reallyall");
+ ProcessStartInfo info = new ProcessStartInfo ("/usr/sbin/hwinfo", "--all --nowpa");
info.UseShellExecute = false;
info.RedirectStandardOutput = true;
info.EnvironmentVariables.Add("hwprobe", "-braille");
- log.Debug("Starting hwinfo --reallyall");
+ log.Debug("Starting hwinfo --all --nowpa");
Process process = Process.Start (info);
string output = process.StandardOutput.ReadToEnd ();
- bool ret = process.WaitForExit (3000);
+ bool ret = process.WaitForExit (30000);
if (ret) {
- log.Debug("hwinfo --reallyall completed");
+ log.Debug("hwinfo --all --nowpa completed");
content = output.Split (new char[] {'\n'});
Parse ();
} else {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org