Hello community,
here is the log from the commit of package zmd-inventory
checked in at Sat Jun 17 09:37:21 CEST 2006.
--------
--- zmd-inventory/zmd-inventory.changes 2006-06-09 19:17:13.000000000 +0200
+++ zmd-inventory/zmd-inventory.changes 2006-06-17 00:53:20.000000000 +0200
@@ -1,0 +2,10 @@
+Sat Jun 17 00:50:34 CEST 2006 - thunder@suse.de
+
+- New source drop (r30603):
+- Deal correctly with network interfaces which don't have any IPs
+ assigned (#185919).
+- Don't erroneously send available patches and products as installed
+ resolvables.
+- Add parsing of mount points for logical disks.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd-inventory.spec ++++++
--- /var/tmp/diff_new_pack.nfmvqR/_old 2006-06-17 09:37:04.000000000 +0200
+++ /var/tmp/diff_new_pack.nfmvqR/_new 2006-06-17 09:37:04.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: 9
+Release: 10
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %name-%version.tar.bz2
@@ -59,6 +59,13 @@
%{_prefix}/lib/zmd/modules/*
%changelog -n zmd-inventory
+* Sat Jun 17 2006 - thunder@suse.de
+- New source drop (r30603):
+- Deal correctly with network interfaces which don't have any IPs
+ assigned (#185919).
+- Don't erroneously send available patches and products as installed
+ resolvables.
+- Add parsing of mount points for logical disks.
* Fri Jun 09 2006 - maw@suse.de
- New source drop (r30090) which:
- Implements hardware inventory for Novell Update services. #155824
++++++ 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-09 00:22:44.000000000 +0200
+++ new/zmd-inventory-7.1.1.0/src/ChangeLog 2006-06-16 22:46:37.000000000 +0200
@@ -1,3 +1,20 @@
+2006-06-16 Dan Mills
+
+ * NUInventory.cs (MakeXmlRpcNet): Deal with network devices that
+ have no IP address. Fixes bug #185919.
+
+2006-06-14 Dan Mills
+
+ * NUInventory.cs (SendInventory): Send installed patches/products
+ only (not in the updates call).
+
+2006-06-09 Dan Mills
+
+ * Scanner.cs (LogicalDisk):
+ * NUInventory.cs:
+
+ Parse where mounted logical disks get mounted to.
+
2006-06-08 Dan Mills
* NUInventory.cs:
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-09 00:18:11.000000000 +0200
+++ new/zmd-inventory-7.1.1.0/src/NUInventory.cs 2006-06-16 22:36:05.000000000 +0200
@@ -193,7 +193,11 @@
private static XmlRpcNet MakeXmlRpcNet (HardwareItem item) {
NetAdapter n = item as NetAdapter;
XmlRpcNet net = new XmlRpcNet ();
- net.ip = n.IPAddresses[0].IPAddress1;
+ if (n.IPAddresses.Length > 0) {
+ net.ip = n.IPAddresses[0].IPAddress1;
+ } else {
+ net.ip = "N/A";
+ }
net.hwaddr = n.macaddress;
net.device = n.slot;
net.driver = n.driver.name;
@@ -268,7 +272,7 @@
private static XmlRpcMount MakeXmlRpcMount (HardwareItem item) {
LogicalDisk d = item as LogicalDisk;
XmlRpcMount mount = new XmlRpcMount ();
- mount.mounted = "N/A"; // fixme
+ mount.mounted = d.mountedPath;
mount.size = (int) d.fileSystemSize;
mount.used = (int) (d.fileSystemSize - d.availableSpace);
mount.device = d.volumeLabel;
@@ -293,8 +297,8 @@
ArrayList inventory = new ArrayList ();
inventory.AddRange (MakeXmlRpcResolvable (PackageManager.InstalledPackages.ToResolvables (), "package"));
- inventory.AddRange (MakeXmlRpcResolvable (Patch.GetAll (), "patch"));
- inventory.AddRange (MakeXmlRpcResolvable (Product.GetAll (), "product"));
+ inventory.AddRange (MakeXmlRpcResolvable (Patch.GetInstalled (), "patch"));
+ inventory.AddRange (MakeXmlRpcResolvable (Product.GetInstalled (), "product"));
string checksum = NeedUpdate ((XmlRpcResolvable[]) inventory.ToArray (typeof (XmlRpcResolvable)));
if (checksum == null) {
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 00:13:43.000000000 +0200
+++ new/zmd-inventory-7.1.1.0/src/Scanner.cs 2006-06-09 22:36:00.000000000 +0200
@@ -974,6 +974,8 @@
private static readonly ILog log = LogManager.GetLogger (typeof (LogicalDisk));
private static ArrayList parsedDisks;
+ public string mountedPath;
+
protected static void HandleProcessOutput (object sender, EventArgs a) {
ProcessProgressArgs args = a as ProcessProgressArgs;
if (args.IsStdout) {
@@ -1006,6 +1008,7 @@
this.fileSystemType = pieces[1];
this.fileSystemSize = Convert.ToInt64 (pieces[2]);
this.availableSpace = Convert.ToInt64 (pieces[4]);
+ this.mountedPath = Convert.ToString (pieces[6]);
this.devId = Util.UnknownString;
this.volSerialNumber = Util.UnknownString;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org