Rev 4826: (igc) include all files not specifically blacklisted when packaging plugins in file:///home/pqm/archives/thelove/bzr/2.1/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.1/

------------------------------------------------------------
revno: 4826 [merge]
revision-id: pqm at pqm.ubuntu.com-20100310051001-xoxuio7z7sh27n1w
parent: pqm at pqm.ubuntu.com-20100305103351-zj43vgxsnyjf0oce
parent: ian.clatworthy at canonical.com-20100307133542-lkerlguzwfb61idq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.1
timestamp: Wed 2010-03-10 05:10:01 +0000
message:
  (igc) include all files not specifically blacklisted when packaging plugins
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
=== modified file 'NEWS'
--- a/NEWS	2010-03-05 08:48:31 +0000
+++ b/NEWS	2010-03-07 13:35:42 +0000
@@ -14,6 +14,8 @@
 Bug Fixes
 *********
 
+* Fix plugin packaging on Windows. (Ian Clatworthy, #524162)
+
 * Fix stub sftp test server to call os.getcwdu().
   (Vincent Ladeuil, #526211, #526353)
 

=== modified file 'setup.py'
--- a/setup.py	2010-03-04 17:45:20 +0000
+++ b/setup.py	2010-03-07 13:33:37 +0000
@@ -37,7 +37,7 @@
     'version':      bzrlib.__version__,
     'author':       'Canonical Ltd',
     'author_email': 'bazaar at lists.canonical.com',
-    'url':          'http://www.bazaar-vcs.org/',
+    'url':          'http://bazaar.canonical.com/',
     'description':  'Friendly distributed version control system',
     'license':      'GNU GPL v2',
     'download_url': 'https://launchpad.net/bzr/+download',
@@ -553,7 +553,7 @@
                                      version = version_str,
                                      description = META_INFO['description'],
                                      author = META_INFO['author'],
-                                     copyright = "(c) Canonical Ltd, 2005-2009",
+                                     copyright = "(c) Canonical Ltd, 2005-2010",
                                      company_name = "Canonical Ltd.",
                                      comments = META_INFO['description'],
                                     )
@@ -624,7 +624,11 @@
             excludes.extend(["bzrlib.plugins." + d for d in dirs])
         x = []
         for i in files:
-            if os.path.splitext(i)[1] not in [".py", ".pyd", ".dll", ".mo"]:
+            # Throw away files we don't want packaged. Note that plugins may
+            # have data files with all sorts of extensions so we need to
+            # be conservative here about what we ditch.
+            ext = os.path.splitext(i)[1]
+            if ext.endswith('~') or ext in [".pyc", ".swp"]:
                 continue
             if i == '__init__.py' and root == 'bzrlib/plugins':
                 continue