Hi release team,
Can you please unlock ocsinventory-agent 0.0.9.2repack1-4. This upload
fix a nasty bug that was breaking a parameter and creating a unhelpful
warning message for the user.
http://bugs.debian.org/497710
The patch come from upstream CVS.
I attached the debdiff.
Best regards,
Gonéri Le Bouder
diff -u ocsinventory-agent-0.0.9.2repack1/debian/changelog ocsinventory-agent-0.0.9.2repack1/debian/changelog
--- ocsinventory-agent-0.0.9.2repack1/debian/changelog
+++ ocsinventory-agent-0.0.9.2repack1/debian/changelog
@@ -1,3 +1,10 @@
+ocsinventory-agent (1:0.0.9.2repack1-4) unstable; urgency=low
+
+ * fix: --nosoftware option has no effect and give a warning
+ - add patch from upstream CVS, thanks Laurent Léonard (Closes: #497710)
+
+ -- Gonéri Le Bouder <goneri@rulezlan.org> Fri, 05 Sep 2008 16:55:52 +0200
+
ocsinventory-agent (1:0.0.9.2repack1-3) unstable; urgency=low
* Add Romanian debconf template (Closes: #488738)
diff -u ocsinventory-agent-0.0.9.2repack1/debian/patches/series ocsinventory-agent-0.0.9.2repack1/debian/patches/series
--- ocsinventory-agent-0.0.9.2repack1/debian/patches/series
+++ ocsinventory-agent-0.0.9.2repack1/debian/patches/series
@@ -1,0 +2 @@
+fix-no-software.patch
only in patch2:
unchanged:
--- ocsinventory-agent-0.0.9.2repack1.orig/debian/patches/fix-no-software.patch
+++ ocsinventory-agent-0.0.9.2repack1/debian/patches/fix-no-software.patch
@@ -0,0 +1,54 @@
+diff -Nru Ocsinventory-Agent-0.0.9.2/lib/Ocsinventory/Agent/Backend/OS/AIX/Software.pm Ocsinventory-Agent-0.0.9.2-nosoftware/lib/Ocsinventory/Agent/Backend/OS/AIX/Software.pm
+--- Ocsinventory-Agent-0.0.9.2/lib/Ocsinventory/Agent/Backend/OS/AIX/Software.pm 2008-04-02 17:33:20.000000000 +0200
++++ Ocsinventory-Agent-0.0.9.2-nosoftware/lib/Ocsinventory/Agent/Backend/OS/AIX/Software.pm 2008-09-03 15:15:05.000000000 +0200
+@@ -6,8 +6,8 @@
+ sub check {
+ my $params = shift;
+
+- # Do not run an package inventory if there is the --nosoft parameter
+- return if ($params->{params}->{nosoft});
++ # Do not run an package inventory if there is the --nosoftware parameter
++ return if ($params->{params}->{nosoftware});
+
+ `lslpp -l 2>&1`;
+ return if ($? >> 8)!=0;
+diff -Nru Ocsinventory-Agent-0.0.9.2/lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging.pm Ocsinventory-Agent-0.0.9.2-nosoftware/lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging.pm
+--- Ocsinventory-Agent-0.0.9.2/lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging.pm 2008-04-02 17:33:20.000000000 +0200
++++ Ocsinventory-Agent-0.0.9.2-nosoftware/lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging.pm 2008-09-03 15:15:18.000000000 +0200
+@@ -5,8 +5,8 @@
+ sub check {
+ my $params = shift;
+
+- # Do not run an package inventory if there is the --nosoft parameter
+- return if ($params->{params}->{nosoft});
++ # Do not run an package inventory if there is the --nosoftware parameter
++ return if ($params->{params}->{nosoftware});
+
+ 1;
+ }
+diff -Nru Ocsinventory-Agent-0.0.9.2/lib/Ocsinventory/Agent/Backend/OS/Solaris/Packages.pm Ocsinventory-Agent-0.0.9.2-nosoftware/lib/Ocsinventory/Agent/Backend/OS/Solaris/Packages.pm
+--- Ocsinventory-Agent-0.0.9.2/lib/Ocsinventory/Agent/Backend/OS/Solaris/Packages.pm 2008-04-02 17:33:20.000000000 +0200
++++ Ocsinventory-Agent-0.0.9.2-nosoftware/lib/Ocsinventory/Agent/Backend/OS/Solaris/Packages.pm 2008-09-03 15:15:33.000000000 +0200
+@@ -6,8 +6,8 @@
+ sub check {
+ my $params = shift;
+
+- # Do not run an package inventory if there is the --nosoft parameter
+- return if ($params->{params}->{nosoft});
++ # Do not run an package inventory if there is the --nosoftware parameter
++ return if ($params->{params}->{nosoftware});
+
+ `which pkginfo 2>&1`;
+ return if ($? >> 8)!=0;
+diff -Nru Ocsinventory-Agent-0.0.9.2/ocsinventory-agent Ocsinventory-Agent-0.0.9.2-nosoftware/ocsinventory-agent
+--- Ocsinventory-Agent-0.0.9.2/ocsinventory-agent 2008-04-18 18:49:44.000000000 +0200
++++ Ocsinventory-Agent-0.0.9.2-nosoftware/ocsinventory-agent 2008-09-03 15:24:25.000000000 +0200
+@@ -210,7 +210,7 @@
+
+ });
+
+-if ($params->{nosoftware}) {
++if ($params->{nosoft}) {
+ $logger->info("the parameter --nosoft is deprecated and may be removed in a futur release, please use --nosoftware instead.");
+ $params->{nosoftware} = 1
+ }
Attachment:
signature.asc
Description: Digital signature