PR#54: Revert "primary: use proper regex for basename" - mdapi

mdapi

#54 Revert "primary: use proper regex for basename"

Merged 7 years ago by pingou. Opened 7 years ago by pingou.

fix_basename into master

Revert "primary: use proper regex for basename"

Pierre-Yves Chibon • 7 years ago

4b03ff8

<a class="font-weight-bold ml-2" href="/mdapi/blob/4a36b3a4751face4d278e81582b64c295b16e812/f/mdapi/primary.py" title="View file as of 4a36b3a">mdapi/primary.py</a>

<div class="btn btn-outline-secondary disabled opacity-100 border-0 font-weight-bold"> file modified </div> <div class="btn-group"> <span class="btn btn-success btn-sm font-weight-bold disabled opacity-100">+2</span> <span class="btn btn-danger btn-sm font-weight-bold disabled opacity-100">-15</span> </div> <a class="btn btn-outline-primary btn-sm ml-2" href="/mdapi/blob/4a36b3a4751face4d278e81582b64c295b16e812/f/mdapi/primary.py" title="View file as of 4a36b3a"> <i class="fa fa-file-code-o fa-fw"></i> </a> <a class="btn btn-sm btn-outline-primary diffhighlightcollapse ml-2 pointer" data-toggle="collapse" data-target="#diffhighlight_1"> <i class="fa fa-fw fa-caret-up"></i> </a>

		`@@ -26,7 +26,6 @@`
		`import sqlalchemy as sa`

		`from sqlalchemy.ext.declarative import declarative_base`
		`- from sqlalchemy.ext.hybrid import hybrid_property`

		`BASE = declarative_base()`

		`@@ -47,22 +46,10 @@`
		`summary = sa.Column(sa.Text)`
		`description = sa.Column(sa.Text)`

		`- @hybrid_property`
		`+ @property`
		`def basename(self):`
		`''' Return the base package name using the rpm_sourcerpms info. '''`
		`- suffix_len = len('-{0.version}-{0.release}.src.rpm'.format(self))`
		`- return self.rpm_sourcerpm[0:-suffix_len]`
		`-`
		`- @basename.expression`
		`- def basename(cls):`
		`- # -{0.version}`
		`- suffix_ver = 1 + sa.func.length(cls.version)`
		`- # -{0.release}`
		`- suffix_rel = 1 + sa.func.length(cls.release)`
		`- # Combined`
		`- suffix_len = suffix_ver + suffix_rel + len('.src.rpm')`
		`- return sa.func.substr(cls.rpm_sourcerpm, 1,`
		`- sa.func.length(cls.rpm_sourcerpm) - suffix_len)`
		`+ return self.rpm_sourcerpm.rsplit('-', 2)[0]`

		`def to_json(self):`
		`pkg = {`

pingou commented 7 years ago

After realizing that the version used in this patch is the version of
the package which may differ from the version of the source rpm that
we are processing here, and considering that in fact release tag do
not use '-', Igor and I decided to revert this patch.

This reverts commit dec253d.