[pve-devel] r5294 - in pve-manager/trunk: . bin debian

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-11-03 07:27:13 +0000 (Wed, 03 Nov 2010)
New Revision: 5294

Modified:
   pve-manager/trunk/ChangeLog
   pve-manager/trunk/bin/pvectl
   pve-manager/trunk/configure.in
   pve-manager/trunk/debian/changelog.Debian
Log:


Modified: pve-manager/trunk/ChangeLog
===================================================================
--- pve-manager/trunk/ChangeLog	2010-10-29 09:35:26 UTC (rev 5293)
+++ pve-manager/trunk/ChangeLog	2010-11-03 07:27:13 UTC (rev 5294)
@@ -1,3 +1,8 @@
+2010-11-03  Proxmox Support Team  <support at proxmox.com>
+
+	* bin/pvectl (change_veconfig): fix comparison of undefined
+	values.
+
 2010-10-27  Proxmox Support Team  <support at proxmox.com>
 
 	* po/it.po: fix typo

Modified: pve-manager/trunk/bin/pvectl
===================================================================
--- pve-manager/trunk/bin/pvectl	2010-10-29 09:35:26 UTC (rev 5293)
+++ pve-manager/trunk/bin/pvectl	2010-11-03 07:27:13 UTC (rev 5294)
@@ -174,10 +174,18 @@
 
     my $mem = int (($veconf->{vmguarpages}->{bar} * 4) / 1024);
     my $disk = $veconf->{diskspace}->{bar} / (1024*1024);
+
     my $cpuunits = $veconf->{cpuunits}->{value} || 1000;
+    my $cpuunits_org = $cpuunits;
+
     my $quotatime = $veconf->{quotatime}->{value} || 0;
+    my $quotatime_org = $quotatime;
+
     my $quotaugidlimit = $veconf->{quotaugidlimit}->{value} || 0;
+    my $quotaugidlimit_org = $quotaugidlimit;
+
     my $cpus = $veconf->{cpus}->{value} || 1;
+    my $cpus_org = $cpus;
 
     my $swdiff = $veconf->{vmguarpages}->{bar} - $veconf->{lockedpages}->{bar};
     my $swap = $swdiff > 0 ? int (($swdiff * 4) / 1024) : 0;
@@ -244,19 +252,19 @@
 
     # cpu settings
 
-    if ($veconf->{'cpuunits'}->{value} != $cpuunits) {
+    if ($cpuunits_org != $cpuunits) {
 	push @$changes, '--cpuunits', "$cpuunits";
     }
 
-    if ($veconf->{'quotatime'}->{value} != $quotatime) {
+    if ($quotatime_org != $quotatime) {
 	push @$changes, '--quotatime', "$quotatime";
     }
 
-    if ($veconf->{'quotaugidlimit'}->{value} != $quotaugidlimit) {
+    if ($quotaugidlimit_org != $quotaugidlimit) {
 	push @$changes, '--quotaugidlimit', "$quotaugidlimit";
     }
 
-    if ($veconf->{'cpus'}->{value} != $cpus) {
+    if ($cpus_org != $cpus) {
 	push @$changes, '--cpus', "$cpus";
     }
 

Modified: pve-manager/trunk/configure.in
===================================================================
--- pve-manager/trunk/configure.in	2010-10-29 09:35:26 UTC (rev 5293)
+++ pve-manager/trunk/configure.in	2010-11-03 07:27:13 UTC (rev 5294)
@@ -4,7 +4,7 @@
 
 prefix=/usr
 
-PACKAGERELEASE=7
+PACKAGERELEASE=8
 AC_SUBST(PACKAGERELEASE)
 
 REPOID=`svnversion .`

Modified: pve-manager/trunk/debian/changelog.Debian
===================================================================
--- pve-manager/trunk/debian/changelog.Debian	2010-10-29 09:35:26 UTC (rev 5293)
+++ pve-manager/trunk/debian/changelog.Debian	2010-11-03 07:27:13 UTC (rev 5294)
@@ -1,3 +1,9 @@
+pve-manager (1.6-8) unstable; urgency=low
+
+  * fix config change detection in pvectl
+
+ -- Proxmox Support Team <support at proxmox.com>  Wed, 03 Nov 2010 08:06:23 +0100
+
 pve-manager (1.6-7) unstable; urgency=low
 
   * fix for previous change - really query remote host.