lazr-developers team mailing list archive

[Barry Warsaw <barry@xxxxxxxxxxxxx>]

On Jan 21, 2009, at 09:27 PM, Edwin Grubbs wrote:

>Review: Approve code
>merge-conditional
>
>Hi Barry,
>
>I'm happy with Gary's review. I just have one other item to point out. I get the following error when I run it, since it does the keyword substitution on the prepare.py file, and then it tells bzr to remove it from the branch, which it doesn't like:
>
>$ python2.5 ./prepare.py marko
>src/lazr/yourpkg => src/lazr/marko
>bzr: ERROR: Can't safely remove modified or unknown files:
>modified:
>  prepare.py*
>Use --keep to not delete them, or --force to delete them regardless.
>

Good catch.  Fixed.  Thanks!

=== modified file 'prepare.py'
--- prepare.py	2009-01-22 02:58:23 +0000
+++ prepare.py	2009-01-22 03:02:47 +0000
@@ -115,6 +115,11 @@
         if '.bzr' in dirnames:
             dirnames.remove('.bzr')
         for filename in filenames:
+            # Skip the prepare.py file if we're not keeping it, otherwise bzr
+            # rm will complain.
+            if (not options.keep and
+                os.path.join(dirpath, filename) == __file__):
+                continue
             if filename.endswith('.pyc'):
                 continue
             # We should do the substitution in every file.

-- 
https://code.launchpad.net/~barry/lazr.yourpkg/prepare/+merge/2997
Your team LAZR Developers is subscribed to branch lp:lazr.yourpkg.