Merge lp:~stefanor/bzr-builddeb/upstream-version-strip-711826 into lp:bzr-builddeb

[Stefano Rivera]

[Jelmer Vernooij (jelmer)]

Hi Stefano,

On Wed, 2011-02-02 at 12:47 +0000, Stefano Rivera wrote:
> Stefano Rivera has proposed merging lp:~stefanor/bzr-builddeb/upstream-version-strip-711826 into lp:bzr-builddeb.
>
> Requested reviews:
> Bzr-builddeb-hackers (bzr-builddeb-hackers)
> Related bugs:
> #711826 bzr-builddeb strips two "-X" blocks from the end of the version instead of only one, when looking for the upstream tarball
> https://bugs.launchpad.net/bugs/711826
Thanks for the patch. This seems reasonable, though I also wonder if we
shouldn't fix it in the other place instead - that way upstream.py
doesn't need to know about Debian versions at all, and it could just
stick to upstream versions everywhere.

Cheers,

Jelmer

[James Westby (james-w)]

> Thanks for the patch. This seems reasonable, though I also wonder if we
> shouldn't fix it in the other place instead - that way upstream.py
> doesn't need to know about Debian versions at all, and it could just
> stick to upstream versions everywhere.

That sounds like a good idea to me. I don't know why upstream.py would need
to know about the full version.

Stefano, would you be comfortable making that change, or would you like one
of us to do it?

Thanks,

James

[lp:~stefanor/bzr-builddeb/upstream-version-strip-711826]

507. By Jelmer Vernooij on 2011-02-02

Merge support for TarfileSource and for automatically detecting v3 source packages in merge-upstream.

[Stefano Rivera (stefanor)]

Yeah that sounds reasonable, I'll have a shot at it now.

The quick easy solution is almost never the one the upstream wants for long term :)

[Stefano Rivera (stefanor)]

There.

Tests pass (as much as they currently do) :)

[lp:~stefanor/bzr-builddeb/upstream-version-strip-711826]

509. By Stefano Rivera on 2011-02-02

Only pass upstream version string to UpstreamProvider

510. By Stefano Rivera on 2011-02-02

UpstreamProvider's version is now an upstream-component version string

511. By Stefano Rivera on 2011-02-02

Use string version in _SimpleUpstreamProvider

[Jelmer Vernooij (jelmer)]

On Wed, 2011-02-02 at 21:01 +0000, Stefano Rivera wrote:
> There.
Thanks. Looks good to me, and great to see we don't even need Version in
upstream.py anymore. (:

  review approve

> Tests pass (as much as they currently do) :)
Do you have broken tests in trunk at the moment? If so, please do file
bugs. That's not the desired state of the testsuite. :)

Cheers,

Jelmer

review: Approve

[Stefano Rivera (stefanor)]

> Do you have broken tests in trunk at the moment?

They look configobj related. /me files bugs

=== modified file 'cmds.py'
--- cmds.py	2011-02-02 16:12:04 +0000
+++ cmds.py	2011-02-02 21:03:21 +0000
@@ -405,7 +405,7 @@
                 upstream_sources.append(SelfSplitSource(tree))
  
             upstream_provider = UpstreamProvider(changelog.package,
-                changelog.version, orig_dir, upstream_sources)
+                changelog.version.upstream_version, orig_dir, upstream_sources)
 
             if build_type == BUILD_TYPE_MERGE:
                 distiller_cls = MergeModeDistiller
@@ -996,8 +996,8 @@
         if orig_dir is None:
             orig_dir = default_orig_dir
 
-        upstream_provider = UpstreamProvider(changelog.package, 
-                changelog.version.upstream_version, orig_dir, 
+        upstream_provider = UpstreamProvider(changelog.package,
+                changelog.version.upstream_version, orig_dir,
                 [PristineTarSource(t, t.branch),
                  AptSource(),
                  GetOrigSourceSource(t, larstiq),

=== modified file 'dh_make.py'
--- dh_make.py	2011-02-02 16:04:04 +0000
+++ dh_make.py	2011-02-02 21:03:21 +0000
@@ -66,7 +66,7 @@
     trace.note("Fetching tarball")
     repack_tarball(tarball, dest_name, target_dir=orig_dir,
             force_gz=not use_v3)
-    provider = upstream.UpstreamProvider(package_name, "%s-1" % version,
+    provider = upstream.UpstreamProvider(package_name, version,
             orig_dir, [])
     provider.provide(os.path.join(tree.basedir, ".."))
     return tarball_filename, util.md5sum_filename(tarball_filename)

=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-02-02 13:18:56 +0000
+++ tests/test_upstream.py	2011-02-02 21:03:21 +0000
@@ -47,7 +47,6 @@
     UpstreamProvider,
     UpstreamSource,
     UScanSource,
-    Version,
     )
 
 
@@ -395,7 +394,7 @@
 
     def __init__(self, package, version, store_dir):
         self.package = package
-        self.version = Version(version)
+        self.version = version
         self.store_dir = store_dir
 
     def provide(self, target_dir):

=== modified file 'upstream.py'
--- upstream.py	2011-02-02 13:18:56 +0000
+++ upstream.py	2011-02-02 21:03:21 +0000
@@ -434,7 +434,7 @@
         :param store_dir: A directory to cache the tarballs.
         """
         self.package = package
-        self.version = Version(version)
+        self.version = version
         self.store_dir = store_dir
         self.source = StackedUpstreamSource(sources)
 
@@ -472,7 +472,7 @@
                 os.makedirs(self.store_dir)
             try:
                 path = self.source.fetch_tarball(self.package,
-                    self.version.upstream_version, self.store_dir)
+                    self.version, self.store_dir)
             except PackageVersionNotPresent:
                 raise MissingUpstreamTarball(self._tarball_names()[0])
             assert isinstance(path, basestring)
@@ -506,9 +506,9 @@
         return path
 
     def _tarball_names(self):
-        return [tarball_name(self.package, self.version.upstream_version),
-                tarball_name(self.package, self.version.upstream_version, format='bz2'),
-                tarball_name(self.package, self.version.upstream_version, format='lzma')]
+        return [tarball_name(self.package, self.version),
+                tarball_name(self.package, self.version, format='bz2'),
+                tarball_name(self.package, self.version, format='lzma')]
 
 
 class TarfileSource(UpstreamSource):