On Sat, Jul 14, 2012 at 10:45:30PM -0500, Domsch, Matt wrote: > In hopes of getting my pull requests merged, as well as the pending > backlog of pull requests, I went ahead and created a tree that has > (nearly) all the pull requests in it now. Of the 22 open requests, > the only one I haven't pulled is firstclown's Pickle encryption > request, because it wasn't clear from the comments that it's in shape > enough to consider pulling. > > https://github.com/mdomsch/s3cmd/tree/merge > (aka the 'merge' branch on my tree at > git://github.com/mdomsch/s3cmd.git) > > I had to make a few minor manual cleanups, but I think they were > straightforward. Shortlog appended from s3tools/s3cmd.git master to > top of my 'merge' branch. > > I did a few operations to be sure it still ran, and it seems to work > as expected.
I've had to add two patches to my 'merge' branch to account for two bugs I've run into. 1) fix mime detection for Fedora python-mime. This accounts for newer Python throwing a TypeError instead of an AttributeError when invoking magic.Magic(flags=...) when flags isn't a valid argument. 2) fix multipart uploads. This was introduced by the merge, the value of self.chunk_size was getting set a little too late after merging in the 'read from stdin' patch. Thanks, Matt -- Matt Domsch Technology Strategist Dell | Office of the CTO ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ S3tools-general mailing list S3tools-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/s3tools-general
