From 13de616e35b30595a2c194fc2f0cf506a91e4010 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sun, 13 Jul 2014 18:08:56 +0100
Subject: [PATCH] Fix truncated port description change (F. Schiavarelli)

---
 Netdisco/Changes                                            | 1 +
 .../App/Netdisco/Daemon/Worker/Interactive/PortActions.pm   | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index 558d2445..8f199e4d 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -8,6 +8,7 @@
 
   * [ND1#117] unknown devices missing from inventory
   * [#118] Fix table rendering on port search tab when VLAN is null
+  * Fix truncated port description change (F. Schiavarelli)
 
 2.028000 - 2014-07-01
 
diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm
index 76761cae..917851a1 100644
--- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm
+++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm
@@ -23,6 +23,10 @@ sub set_portcontrol {
   return job_error("Cannot alter port: $reconfig_check")
     if $reconfig_check;
 
+  # need to remove "-other" which appears for power/portcontrol
+  (my $sa = $job->subaction) =~ s/-\w+//;
+  $job->subaction($sa);
+
   return _set_port_generic($job, 'up_admin');
 }
 
@@ -50,7 +54,7 @@ sub _set_port_generic {
 
   my $ip = $job->device;
   my $pn = $job->port;
-  (my $data = $job->subaction) =~ s/-\w+//;
+  my $data = $job->subaction;
 
   my $port = get_port($ip, $pn)
     or return job_error("Unknown port name [$pn] on device [$ip]");