chaas/debshots
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Use package upstream version. Skip revision. Improve regexp parsing.

Browse source
This commit is contained in:
Christoph Haas 2018-08-22 13:11:28 +02:00
parent 56750c3884
commit 4a9fe8772e
3 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/deb_importer.rb
View file

@ -150,16 +150,16 @@ module DebImporter
end # def
class Version
attr_reader :epoch, :version, :revision, :version_string
attr_reader :epoch, :upstream, :revision, :version_string
def initialize(version_string)
@version_string = version_string
# Split into "[epoch:]version[-revision]"
unless /^(?<epoch>(\d+)\:)?(?<version>.+)(?<revision>\-[\+\.~]+)?/ =~ version_string
unless /^((?<epoch>\d+)\:)?(?<upstream>.+?)(\-(?<revision>.+))?$/ =~ version_string
raise ArgumentError, "Cannot parse version string: #{version_string}"
end
@epoch = epoch ? epoch : 0
@version = version
@epoch = epoch ? epoch : '0'
@upstream = upstream
@revision = revision if revision
end # /def