Merge lp:~kvilhaugsvik/bzr-builddeb/useDateFromDebianChangelog into lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old

[Sveinung Kvilhaugsvik]

[Sveinung Kvilhaugsvik (kvilhaugsvik)]

Changed the default as discussed with james_w on IRC. I did not remove the support for setting it to false when it's called so it can be enabled as an option later if you remember why you didn't enable it be default. Built and installed on Squeeze and Jaunty. Imported a package. It used the dates from the changelog in the commit log. bzr test-builddeb gave me the same result with and without my changes. This was only tested on Jaunty.

[Sveinung Kvilhaugsvik (kvilhaugsvik)]

> bzr test-builddeb gave me the same result with and without my changes
That result was by the way a failure, but the same tests failed. If that was not expected you may want to run it yourself.

[James Westby (james-w)]

Excerpts from Sveinung Kvilhaugsvik's message of Fri Aug 21 00:50:10 UTC 2009:
> > bzr test-builddeb gave me the same result with and without my changes
> That result was by the way a failure, but the same tests failed. If that was
> not expected you may want to run it yourself.

Which tests failed? They were all successful last time I ran them.

I'll run them tomorrow when I merge your change anyway, but I'd like
to know in case it doesn't match up.

Thanks,

James

[Sveinung Kvilhaugsvik (kvilhaugsvik)]

Sorry about the late response. Somehow the email notification was
marked as read. I didn't see this before today when I looked at the
merge proposal at Launchpad. The output of the tests are attached. I'm
running it on a quite new install of Debian Squeeze.

[Sveinung Kvilhaugsvik (kvilhaugsvik)]

Seems like Launchpad didn't accept the attachment from the email. Here it is as text:

$ bzr test-builddeb
testing: /usr/bin/bzr
   /usr/lib/python2.5/site-packages/bzrlib (1.17 python2.5.4)

FAIL: bzrlib.plugins.builddeb.changes.DebianChanges.__init__
    Failed doctest test for bzrlib.plugins.builddeb.changes.DebianChanges.__init__
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/builddeb/changes.py", line 33, in __init__

----------------------------------------------------------------------
File "/usr/lib/python2.5/site-packages/bzrlib/plugins/builddeb/changes.py", line 37, in bzrlib.plugins.builddeb.changes.DebianChanges.__init__
Failed example:
    c = DebianChanges('bzr-builddeb', '0.1-1', file_dir, 'i386')
Exception raised:
    Traceback (most recent call last):
      File "/usr/lib/python2.5/doctest.py", line 1228, in __run
        compileflags, 1) in test.globs
      File "<doctest bzrlib.plugins.builddeb.changes.DebianChanges.__init__[2]>", line 1, in <module>
        c = DebianChanges('bzr-builddeb', '0.1-1', file_dir, 'i386')
      File "/usr/lib/python2.5/site-packages/bzrlib/plugins/builddeb/changes.py", line 61, in __init__
        raise MissingChanges(changes)
    MissingChanges: Could not find .changes file: /usr/lib/python2.5/site-packages/bzrlib/plugins/builddeb/bzr-builddeb_0.1-1_i386.changes.
----------------------------------------------------------------------
File "/usr/lib/python2.5/site-packages/bzrlib/plugins/builddeb/changes.py", line 38, in bzrlib.plugins.builddeb.changes.DebianChanges.__init__
Failed example: ...

[James Westby (james-w)]

On Tue Aug 25 21:53:06 UTC 2009 Sveinung Kvilhaugsvik wrote:
> Seems like Launchpad didn't accept the attachment from the email. Here it is as
> text:

Thanks.

> c = DebianChanges('bzr-builddeb', '0.1-1', file_dir, 'i386')

It couldn't be that this test requires running on i386 could it?

Thanks,

James

[James Westby (james-w)]

Merged, thanks.

James

review: Approve

[Sveinung Kvilhaugsvik (kvilhaugsvik)]

> It couldn't be that this test requires running on i386 could it?
I'm running it on i386. (Squeeze in Virtualbox on amd64 Lenny) uname --all shows kernel 2.6.30-1-686

[James Westby (james-w)]

On Fri Aug 28 14:12:08 UTC 2009 James Westby wrote:
> On Tue Aug 25 21:53:06 UTC 2009 Sveinung Kvilhaugsvik wrote:
> > Seems like Launchpad didn't accept the attachment from the email. Here it is as
> > text:
>
> Thanks.
>
> > c = DebianChanges('bzr-builddeb', '0.1-1', file_dir, 'i386')
>
> It couldn't be that this test requires running on i386 could it?

No, it seems more likely that it can't find the .changes file used
as test data. It's looking for bzr-builddeb_0.1-1_i386.changes
in os.path.dirname(__file__), which I think should work if you
are running from source.

Thanks,

James

=== modified file 'import_dsc.py'
--- import_dsc.py	2009-07-26 16:44:17 +0000
+++ import_dsc.py	2009-08-20 20:58:56 +0000
@@ -1510,7 +1510,7 @@
                 break
         return versions
 
-    def import_package(self, dsc_filename, use_time_from_changelog=False):
+    def import_package(self, dsc_filename, use_time_from_changelog=True):
         """Import a source package.
 
         :param dsc_filename: a path to a .dsc file for the version