Re: if someone knows how .... -- redundant patch applied to robot.pm
Nathan Stratton Treadway <[email protected]> Thu, 7 Nov 2019 20:29:59 -0500
| Newsgroups | gmane.comp.archivers.amanda.devel |
|---|---|
| Message-ID | <[email protected]> |
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 master. 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): ===== $ 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_steps step ); 2552-use Amanda::Device qw( :constants ); 2553-use Carp; ===== 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 = 6AD8 485E 20B9 5C71 231C 0C32 15F3 ADCD ECFB 6239