Re: if someone knows how .... -- redundant patch applied to robot.pm
Chris Hassell <[email protected]> Fri, 8 Nov 2019 16:58:49 +0000
| Newsgroups | gmane.comp.archivers.amanda.devel |
|---|---|
| Message-ID | <MWHPR1301MB1982385D8B01D0BC01523EBF977B0@MWHPR1301MB1982.namprd13.prod.outlook.com> |
--_000_MWHPR1301MB1982385D8B01D0BC01523EBF977B0MWHPR1301MB1982_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Freakin' derp. I'll revert that. ________________________________ From: Nathan Stratton Treadway <[email protected]> Sent: Thursday, November 7, 2019 6:29 PM To: Chris Hassell <[email protected]> Cc: amanda-hackers <[email protected]> Subject: Re: if someone knows how .... -- redundant patch applied to robot.= pm WARNING: This email originated from outside of BETSOL. Do not click links o= r open attachments unless you recognize the sender and know the content is = safe. On Thu, Nov 07, 2019 at 23:43:25 +0000, Chris Hassell wrote: > I did some code reviews and then pulled ... but the changes ended up on m= aster. I noticed that (in the 3_5 branch), your commit 47636fd4 applied the patch from debian/patches/20-fix-robot.pm... but previous commit 2cd18346 already added "use Carp;" a few lines earlier, so now it appears twice (i.e. lines 2547 and 2553 in this snippet): =3D=3D=3D=3D=3D $ git show origin/3_5:perl/Amanda/Changer/robot.pm | grep -n -A8 "package.*= Interface::MTX" 2545:package Amanda::Changer::robot::Interface::MTX; 2546- 2547-use Carp; 2548-use Amanda::Paths; 2549-use Amanda::Config qw( :getconf ); 2550-use Amanda::Debug qw( debug warning ); 2551-use Amanda::MainLoop qw( :GIOCondition synchronized make_cb define_ste= ps step ); 2552-use Amanda::Device qw( :constants ); 2553-use Carp; =3D=3D=3D=3D=3D Nathan ---------------------------------------------------------------------------= - Nathan Stratton Treadway - [email protected] - Mid-Atlantic region Ray Ontko & Co. - Software consulting services - http://www.ontko.com/ GPG Key: http://www.ontko.com/~nathanst/gpg_key.txt ID: 1023D/ECFB6239 Key fingerprint =3D 6AD8 485E 20B9 5C71 231C 0C32 15F3 ADCD ECFB 6239 Confidentiality Notice | The information transmitted by this email is inten= ded only for the person or entity to which it is addressed. This email may = contain proprietary, business-confidential and/or privileged material. If y= ou are not the intended recipient of this message, be aware that any use, r= eview, re-transmission, distribution, reproduction or any action taken in r= eliance upon this message is strictly prohibited. If you received this in e= rror, please contact the sender and delete the material from all computers. --_000_MWHPR1301MB1982385D8B01D0BC01523EBF977B0MWHPR1301MB1982_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable <html> <head> <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dus-ascii"= > <style type=3D"text/css" style=3D"display:none;"> P {margin-top:0;margin-bo= ttom:0;} </style> </head> <body dir=3D"ltr"> <div style=3D"font-family: Calibri, Arial, Helvetica, sans-serif; font-size= : 12pt; color: rgb(0, 0, 0);"> Freakin' derp. I'll revert that.</div> <div id=3D"appendonsend"></div> <hr style=3D"display:inline-block;width:98%" tabindex=3D"-1"> <div id=3D"divRplyFwdMsg" dir=3D"ltr"><font face=3D"Calibri, sans-serif" st= yle=3D"font-size:11pt" color=3D"#000000"><b>From:</b> Nathan Stratton Tread= way <[email protected]><br> <b>Sent:</b> Thursday, November 7, 2019 6:29 PM<br> <b>To:</b> Chris Hassell <[email protected]><br> <b>Cc:</b> amanda-hackers <[email protected]><br> <b>Subject:</b> Re: if someone knows how .... -- redundant patch applied to= robot.pm</font> <div> </div> </div> <div class=3D"BodyFragment"><font size=3D"2"><span style=3D"font-size:11pt;= "> <div class=3D"PlainText">WARNING: This email originated from outside of BET= SOL. Do not click links or open attachments unless you recognize the sender= and know the content is safe.<br> <br> <br> On Thu, Nov 07, 2019 at 23:43:25 +0000, Chris Hassell wrote:<br> > I did some code reviews and then pulled ... but the changes ended up o= n master.<br> <br> I noticed that (in the 3_5 branch), your commit 47636fd4 applied the<br> patch from debian/patches/20-fix-robot.pm... but previous commit<br> 2cd18346 already added "use Carp;" a few lines earlier, so now it= <br> appears twice (i.e. lines 2547 and 2553 in this snippet):<br> <br> =3D=3D=3D=3D=3D<br> $ git show origin/3_5:perl/Amanda/Changer/robot.pm | grep -n -A8 "pack= age.*Interface::MTX"<br> 2545:package Amanda::Changer::robot::Interface::MTX;<br> 2546-<br> 2547-use Carp;<br> 2548-use Amanda::Paths;<br> 2549-use Amanda::Config qw( :getconf );<br> 2550-use Amanda::Debug qw( debug warning );<br> 2551-use Amanda::MainLoop qw( :GIOCondition synchronized make_cb define_ste= ps step );<br> 2552-use Amanda::Device qw( :constants );<br> 2553-use Carp;<br> =3D=3D=3D=3D=3D<br> <br> <br> &nb= sp; = &nb= sp; = Nathan<br> <br> ---------------------------------------------------------------------------= -<br> Nathan Stratton Treadway - [email protected] - Mid= -Atlantic region<br> Ray Ontko & Co. - Software consulting services - = ; <a href=3D"http://www.ontko.com/"> http://www.ontko.com/</a><br> GPG Key: <a href=3D"http://www.ontko.com/~nathanst/gpg_key.txt">http:= //www.ontko.com/~nathanst/gpg_key.txt</a> ID: 1023D/ECFB6239<br= > Key fingerprint =3D 6AD8 485E 20B9 5C71 231C 0C32 15F3 ADCD ECF= B 6239<br> </div> </span></font></div> Confidentiality Notice | The information transmitted by this email is inten= ded only for the person or entity to which it is addressed. This email may = contain proprietary, business-confidential and/or privileged material. If y= ou are not the intended recipient of this message, be aware that any use, review, re-transmission, distribut= ion, reproduction or any action taken in reliance upon this message is stri= ctly prohibited. If you received this in error, please contact the sender a= nd delete the material from all computers. </body> </html> --_000_MWHPR1301MB1982385D8B01D0BC01523EBF977B0MWHPR1301MB1982_--