[OSSTEST PATCH 1/2] target_editfile: Improve doc comment

[OSSTEST PATCH 1/2] target_editfile: Improve doc comment

[Ian Jackson]

More clearly state which arguments are optional.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 Osstest/TestSupport.pm |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 45ceee9..46b6720 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -521,7 +521,8 @@ sub teditfileex {
 sub target_editfile_root ($$$;$$) { teditfileex('root',@_); }
 sub target_editfile      ($$$;$$) { teditfileex('osstest',@_); }
     # my $code= pop @_;
-    # my ($ho,$rfile,$lleaf,$rdest) = @_;
+    # my ($ho,$rfile, $lleaf,$rdest) = @_;
+    #                 ^^^^^^^^^^^^^ optional
 
 sub target_cmd_build ($$$$) {
     my ($ho,$timeout,$builddir,$script) = @_;
-- 
1.7.10.4

[OSSTEST PATCH 2/2] cs-adjust-flight: runvar-perlop: Do not report non-changes

[Ian Jackson]

With -v, runvar-perlop would unconditionally print a message about the
changed variable.  Instead, only call runvar_set if the value is to
change.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 cs-adjust-flight |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cs-adjust-flight b/cs-adjust-flight
index 7ec17e3..d6cab1a 100755
--- a/cs-adjust-flight
+++ b/cs-adjust-flight
@@ -268,7 +268,8 @@ sub change__runvar_perlop {
         my ($job, $name, $varrow) = @_;
 	my $oldval = $varrow->{val};
 	my $newval = perlop_value($job, $name, $op, $oldval);
-        runvar_set($job, $name, $newval, " (modified from \`$oldval')");
+        runvar_set($job, $name, $newval, " (modified from \`$oldval')")
+	    if $newval ne $oldval;
     }, 'IGNORE');
 }
 
-- 
1.7.10.4

Re: [OSSTEST PATCH 1/2] target_editfile: Improve doc comment

[Ian Campbell]

On Fri, 2014-11-14 at 16:27 +0000, Ian Jackson wrote:
> More clearly state which arguments are optional.
> 
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

> ---
>  Osstest/TestSupport.pm |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
> index 45ceee9..46b6720 100644
> --- a/Osstest/TestSupport.pm
> +++ b/Osstest/TestSupport.pm
> @@ -521,7 +521,8 @@ sub teditfileex {
>  sub target_editfile_root ($$$;$$) { teditfileex('root',@_); }
>  sub target_editfile      ($$$;$$) { teditfileex('osstest',@_); }
>      # my $code= pop @_;
> -    # my ($ho,$rfile,$lleaf,$rdest) = @_;
> +    # my ($ho,$rfile, $lleaf,$rdest) = @_;
> +    #                 ^^^^^^^^^^^^^ optional
>  
>  sub target_cmd_build ($$$$) {
>      my ($ho,$timeout,$builddir,$script) = @_;

Re: [OSSTEST PATCH 2/2] cs-adjust-flight: runvar-perlop: Do not report non-changes

[Ian Campbell]

On Fri, 2014-11-14 at 16:27 +0000, Ian Jackson wrote:
> With -v, runvar-perlop would unconditionally print a message about the
> changed variable.  Instead, only call runvar_set if the value is to
> change.
> 
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

> ---
>  cs-adjust-flight |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/cs-adjust-flight b/cs-adjust-flight
> index 7ec17e3..d6cab1a 100755
> --- a/cs-adjust-flight
> +++ b/cs-adjust-flight
> @@ -268,7 +268,8 @@ sub change__runvar_perlop {
>          my ($job, $name, $varrow) = @_;
>  	my $oldval = $varrow->{val};
>  	my $newval = perlop_value($job, $name, $op, $oldval);
> -        runvar_set($job, $name, $newval, " (modified from \`$oldval')");
> +        runvar_set($job, $name, $newval, " (modified from \`$oldval')")
> +	    if $newval ne $oldval;
>      }, 'IGNORE');
>  }
>