Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2025-01-13 20:01:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix: Cannot install chkrootkit #53

Browse source
This commit is contained in:
Dimitris Zlatanidis 2015-12-30 09:17:59 +02:00
parent d5919c032d
commit 0e98b1d396
6 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog.txt
View file

@ -1,4 +1,9 @@
3.0.3 - 1/12/2015
3.0.4 - 30/12/2015
Fixed:
- Cannot install chkrootkit #53
- Reference message when remove one package
3.0.3 - 01/12/2015
Fixed:
- Upgrading/Installing nouveau in slack repository #55
Updated:

2
slpkg/init.py
View file

@ -60,6 +60,8 @@ class Initialization(object):
os.mkdir(self.tmp_path)
if not os.path.exists(self.build_path):
os.makedirs(self.build_path)
if not os.path.exists(self.build_path + "_SOURCES/"):
os.makedirs(self.build_path + "_SOURCES/")
if not os.path.exists(self.slpkg_tmp_packages):
os.makedirs(self.slpkg_tmp_packages)
if not os.path.exists(self.slpkg_tmp_patches):

4
slpkg/pkg/build.py
View file

@ -75,11 +75,13 @@ class BuildPackage(object):
self._makeflags()
self._delete_sbo_tar_gz()
self._create_md5_dict()
if not self.auto:
os.chdir(self.path + "_SOURCES/")
for src in self.sources:
# fix build sources with spaces
src = src.replace("%20", " ")
check_md5(self.sbo_md5[src], src)
shutil.copy2(src, self.prgnam)
shutil.copy2(src, self.path + self.prgnam)
os.chdir(self.path + self.prgnam)
# change permissions
subprocess.call("chmod +x {0}.SlackBuild".format(self.prgnam),

7
slpkg/sbo/network.py
View file

@ -367,8 +367,13 @@ class SBoNetwork(object):
sources = []
if not os.path.exists(self.meta.build_path):
os.makedirs(self.meta.build_path)
if not os.path.exists(self.meta.build_path + "_SOURCES/"):
os.makedirs(self.meta.build_path + "_SOURCES/")
os.chdir(self.meta.build_path)
Download(self.meta.build_path, self.dwn_srcs, repo="sbo").start()
Download(self.meta.build_path, self.sbo_dwn.split(),
repo="sbo").start()
Download(self.meta.build_path + "_SOURCES/", self.source_dwn,
repo="sbo").start()
script = self.sbo_dwn.split("/")[-1]
for src in self.source_dwn:
sources.append(src.split("/")[-1])

4
slpkg/sbo/queue.py
View file

@ -133,6 +133,8 @@ class QueuePkgs(object):
for pkg in packages:
if not os.path.exists(self.meta.build_path):
os.mkdir(self.meta.build_path)
if not os.path.exists(self.meta.build_path + "_SOURCES/"):
os.mkdir(self.meta.build_path + "_SOURCES/")
sbo_url = sbo_search_pkg(pkg)
sbo_dwn = SBoLink(sbo_url).tar_gz()
source_dwn = SBoGrep(pkg).source().split()
@ -142,7 +144,7 @@ class QueuePkgs(object):
Download(self.meta.build_path, sbo_dwn.split(),
repo="sbo").start()
for src in source_dwn:
Download(self.meta.build_path, src.split(),
Download(self.meta.build_path + "_SOURCES/", src.split(),
repo="sbo").start()
sources.append(src.split("/")[-1])
BuildPackage(script, sources, self.meta.build_path,

8
slpkg/sbo/slackbuild.py
View file

@ -304,6 +304,8 @@ class SBoInstall(object):
installs, upgraded, = [], []
if not os.path.exists(self.build_folder):
os.makedirs(self.build_folder)
if not os.path.exists(self.build_folder + "_SOURCES/"):
os.makedirs(self.build_folder + "_SOURCES/")
os.chdir(self.build_folder)
for prgnam in slackbuilds:
pkg = "-".join(prgnam.split("-")[:-1])
@ -323,8 +325,10 @@ class SBoInstall(object):
sbo_url = sbo_search_pkg(pkg)
sbo_link = SBoLink(sbo_url).tar_gz()
script = sbo_link.split("/")[-1]
dwn_srcs = sbo_link.split() + src_link
Download(self.build_folder, dwn_srcs, repo="sbo").start()
Download(self.build_folder, sbo_link.split(),
repo="sbo").start()
Download(self.build_folder + "_SOURCES/", src_link,
repo="sbo").start()
if "--download-only" in self.flag:
continue
sources = self.filenames(src_link)