Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2025-01-28 19:58:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed build sources with char + in names

Browse source 
Signed-off-by: Dimitris Zlatanidis <d.zlatanidis@gmail.com>
This commit is contained in:
Dimitris Zlatanidis 2019-05-19 16:35:55 +02:00
parent b7af72edd2
commit 98487d5514
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog.txt
View file

@ -3,6 +3,7 @@ Updated:
- Update gen_repos_files.sh to version 1.94 - Update gen_repos_files.sh to version 1.94
Fixed: Fixed:
- Downloader to recognise the char + - Downloader to recognise the char +
- Build from sources with char + in name
3.4.2 - 23/01/2019 3.4.2 - 23/01/2019
Fixed: Fixed:

2
slpkg/downloader.py
View file

@ -26,8 +26,8 @@ import os
import tarfile import tarfile
import subprocess import subprocess
from slpkg.messages import Msg
from slpkg.utils import Utils from slpkg.utils import Utils
from slpkg.messages import Msg
from slpkg.slack.slack_version import slack_ver from slpkg.slack.slack_version import slack_ver
from slpkg.__metadata__ import MetaData as _meta_ from slpkg.__metadata__ import MetaData as _meta_

12
slpkg/pkg/build.py
View file

@ -31,6 +31,7 @@ import tarfile
import subprocess import subprocess
import multiprocessing import multiprocessing
from slpkg.utils import Utils
from slpkg.messages import Msg from slpkg.messages import Msg
from slpkg.checksum import check_md5 from slpkg.checksum import check_md5
from slpkg.__metadata__ import MetaData as _meta_ from slpkg.__metadata__ import MetaData as _meta_
@ -44,6 +45,7 @@ class BuildPackage(object):
def __init__(self, script, sources, path, auto): def __init__(self, script, sources, path, auto):
self.script = script self.script = script
self.sources = sources self.sources = sources
self._check_sources()
self.path = path self.path = path
self.auto = auto self.auto = auto
self.meta = _meta_ self.meta = _meta_
@ -89,7 +91,7 @@ class BuildPackage(object):
src = src.replace("%20", " ") src = src.replace("%20", " ")
check_md5(self.sbo_md5[src], src) check_md5(self.sbo_md5[src], src)
# copy source and fix passing char '+' from file name # copy source and fix passing char '+' from file name
shutil.copy2(src.replace("%2B", "+"), self.path + self.prgnam) shutil.copy2(src, self.path + self.prgnam)
os.chdir(self.path + self.prgnam) os.chdir(self.path + self.prgnam)
# change permissions # change permissions
subprocess.call("chmod +x {0}.SlackBuild".format(self.prgnam), subprocess.call("chmod +x {0}.SlackBuild".format(self.prgnam),
@ -117,6 +119,14 @@ class BuildPackage(object):
except KeyboardInterrupt: # (OSError, IOError): except KeyboardInterrupt: # (OSError, IOError):
self.msg.pkg_not_found("\n", self.prgnam, "Wrong file", "\n") self.msg.pkg_not_found("\n", self.prgnam, "Wrong file", "\n")
def _check_sources(self):
"""Fix filenames with char +
"""
new_sources = []
for src in self.sources:
new_sources.append(Utils().fix_file_name(src))
self.sources = new_sources
def _create_md5_dict(self): def _create_md5_dict(self):
"""Create md5 dictionary per source """Create md5 dictionary per source
""" """