Re: [Ltib] zero-length patches from "-m patchmerge"....

[Stuart Hughes]

Hi Peter,

Thanks for picking that up, I'll fix the misspelling.

Any alternatives for "has not been changed.."

Regards, Stuart

Peter Barada wrote:
> On Sun, 2010-07-25 at 12:11 +0100, Stuart Hughes wrote:
>> Hi Peter,
>>
>> Thanks again for the patch.  I ended up checking in this, which is
>> functionally the same:
> 
> "Proeject" looks to be mispelled in:
> 
> +        print "\nNo changes have been made to $cf->{sn}, ",
> +                "proeject state has not been changed.\n\n";
> 
> 
> Also, "has not been changed" sounds cumbersome, "has not changed" sounds
> better....
> 
>> Regards, Stuart
>>
>> Stuart Hughes wrote:
>> > Hi Peter,
>> > 
>> > Looks good to me, I will apply when I get a chance.
>> > 
>> > Thanks for the patch.
>> > 
>> > Regards, Stuart
>> > 
>> > Peter Barada wrote:
>> >> Stuart,
>> >>
>> >> Here's a patch that makes "./ltib -p <pkg> -m patchmerge" an effective
>> >> no-op if resultant patch is zero-length, moving the
>> >> $pkg_dir_name.modivied back to the original $pkg_dir_name, so you can do
>> >> "./ltib -p <pkg> -m patchmerge; ./ltib -p <pkg> -m scbuild; ./ltib -p
>> >> <pkg> -m patchmerge" successfully if the results are zero-length....
>> >>
>> >> My perl "fu" is pretty weak so I'm sure there's got to be a better way
>> >> to do it. :)
>> >>
>> >>
>> >> address@hidden:~/work/logic/eps_svn/software/products/linux/LTIB/trunk/ltib-20091102$
>> >> svn diff ltib
>> >> Index: ltib
>> >> ===================================================================
>> >> --- ltib (revision 10693)
>> >> +++ ltib (working copy)
>> >> @@ -1170,7 +1170,18 @@
>> >> diff --exclude CVS --exclude .git -uNr $pkg_dir_name
>> >> $pkg_dir_name.modified > $cf->{lpp}/$pname
>> >> rm -rf $cf->{rpmdir}/BUILD/$pkg_dir_name
>> >> TXT
>> >> +    my $filesize = (stat("$cf->{lpp}/$pname"))[7];
>> >> +    if ($filesize == 0) {
>> >> + print <<TXT;
>> >>
>> >> +Resultant patch is zero-length, ignoring.
>> >> +
>> >> +TXT
>> >> + system_nb("rm $cf->{lpp}/$pname");
>> >> + system_nb("mv $cf->{rpmdir}/BUILD/$pkg_dir_name.modified
>> >> $cf->{rpmdir}/BUILD/$pkg_dir_name");
>> >> + return 1;
>> >> +    }
>> >> +
>> >>      open(SPEC, ">$spec.bak") or die("can't open $spec.bak for writing:
>> >> $!");
>> >>      print SPEC $_;
>> >>      close SPEC;
>> >>
>> >>
>> >> ------------------------------------------------------------------------
>>
>>
>> email message attachment (Attached Message)
>>
>>> -------- Forwarded Message --------
>>> *From*: Stuart Hughes <address@hidden
>>> <mailto:address@hidden>>
>>> *To*: address@hidden <mailto:address@hidden>
>>> *Subject*: ltib ltib
>>> *Date*: Sun, 25 Jul 2010 11:08:10 +0000
>>>
>