diff --git a/README.rst b/README.rst index 6878b0af..9fc5773d 100644 --- a/README.rst +++ b/README.rst @@ -173,9 +173,6 @@ Default available Repositories: - `Robby's `_ Arch: {x86, x86_64} Versions: {11.0, 12.0, 12.1, 12.2, 13.0, 13.1, 13.37, 14.0, 14.1, 14,2} -- `Studioware `_ - Arch: {x86, x86_64} - Versions: {13.37, 14.0, 14.1} - `Slackers `_ Arch: {x86_64} Versions: {current} @@ -533,7 +530,6 @@ list. This command must be executed to update the package lists: Update repository [sbo] ... Done Update repository [alien] ... Done Update repository [slacky] ... Done - Update repository [studio] ... Done Update repository [slackr] ... Done Update repository [slonly] ... Done Update repository [ktown] ... Done @@ -622,7 +618,6 @@ View information about the repositories: slackr http://www.slackers.it/repository/ yes disabled slacky http://repository.slacky.eu/ yes disabled slonly https://slackonly.com/pub/packages/ yes disabled - studio http://studioware.org/files/packages/ yes disabled Repositories summary =============================================================================== diff --git a/REPOSITORIES b/REPOSITORIES index e0e52863..0adb52d5 100644 --- a/REPOSITORIES +++ b/REPOSITORIES @@ -26,7 +26,7 @@ dependencies. Slonly repository do not support -current for x86 arch. -Studioware (studio), Alien's ktown (ktown), Alien's multilib (multi), Slacke E17 and E18 +Alien's ktown (ktown), Alien's multilib (multi), Slacke E17 and E18 and Alien's restricted repository has no reference dependencies. IMPORTANT: For Alien's (Eric Hameleers) repositories (alien, multi and ktown) should run diff --git a/conf/default-repositories b/conf/default-repositories index ffa07aff..27fca068 100644 --- a/conf/default-repositories +++ b/conf/default-repositories @@ -26,7 +26,7 @@ # For local repository start with "file:///" avoid end path with "/". # Do NOT change the name of the repository. # Default repositories names: -# sbo, rlw, alien, slacky, studio, slackr, slonly, ktown, multi, slacke, salix, +# sbo, rlw, alien, slacky, slackr, slonly, ktown, multi, slacke, salix, # slackl, rested, msb # ----------------------------------------------------------------------------- # @@ -35,7 +35,6 @@ rlw http://rlworkman.net/pkgs/ alien http://taper.alienbase.nl/mirrors/people/alien/sbrepos/ slacky http://repository.slacky.eu/ - studio http://studioware.org/files/packages/ slackr http://slack.conraid.net/repository/slackware64-current/ slonly https://slackonly.com/pub/packages/ ktown http://alien.slackbook.org/ktown/ diff --git a/conf/repositories.conf b/conf/repositories.conf index 3036f71f..20e5f485 100644 --- a/conf/repositories.conf +++ b/conf/repositories.conf @@ -43,7 +43,6 @@ sbo # alien # rlw # slacky -# studio # slackr # slonly # ktown{latest} diff --git a/man/slpkg.8 b/man/slpkg.8 index 2b3b714a..0467bd9a 100644 --- a/man/slpkg.8 +++ b/man/slpkg.8 @@ -353,7 +353,6 @@ For example: Alien's = "alien" slacky.eu = "slacky" rworkman's = "rlw" - studioware.org = "studio" slacker.it = "slackr" slackonly.com = "slonly" Alien's ktown = "ktown{latest}" diff --git a/slpkg/__metadata__.py b/slpkg/__metadata__.py index f7fb20c6..d555bd0a 100644 --- a/slpkg/__metadata__.py +++ b/slpkg/__metadata__.py @@ -97,7 +97,7 @@ class MetaData(object): _conf_slpkg = { "RELEASE": "stable", "REPOSITORIES": ["slack", "sbo", "rlw", "alien", - "slacky", "studio", "slackr", "slonly", + "slacky", "slackr", "slonly", "ktown{latest}", "multi", "slacke{18}", "salix", "slackl", "rested", "msb{1.16}"], "BUILD_PATH": "/tmp/slpkg/build/", @@ -123,9 +123,9 @@ class MetaData(object): "NOT_DOWNGRADE": "off" } - default_repositories = ["slack", "sbo", "rlw", "alien", "slacky", "studio", - "slackr", "slonly", "ktown", "multi", "slacke", - "salix", "slackl", "rested", "msb"] + default_repositories = ["slack", "sbo", "rlw", "alien", "slacky", "slackr", + "slonly", "ktown", "multi", "slacke", "salix", + "slackl", "rested", "msb"] # read value from configuration file repositories = [] diff --git a/slpkg/binary/repo_init.py b/slpkg/binary/repo_init.py index 08f030c6..443868d0 100644 --- a/slpkg/binary/repo_init.py +++ b/slpkg/binary/repo_init.py @@ -75,13 +75,6 @@ class RepoInit(object): self.mirror = "{0}slackware{1}-{2}/".format( self.def_repo_dict["slacky"], arch, slack_ver()) - def _init_studio(self): - arch = "" - if self.meta.arch == "x86_64": - arch = "64" - self.mirror = "{0}slackware{1}-{2}/".format( - self.def_repo_dict["studio"], arch, slack_ver()) - def _init_slackr(self): self.mirror = self.def_repo_dict["slackr"] diff --git a/slpkg/checks.py b/slpkg/checks.py index 7f4e6df4..22e47702 100644 --- a/slpkg/checks.py +++ b/slpkg/checks.py @@ -46,7 +46,6 @@ class Updates(object): "rlw": self._init.rlw, "alien": self._init.alien, "slacky": self._init.slacky, - "studio": self._init.studio, "slackr": self._init.slackr, "slonly": self._init.slonly, "ktown": self._init.ktown, diff --git a/slpkg/init.py b/slpkg/init.py index 96ce1442..c0cbb4ee 100644 --- a/slpkg/init.py +++ b/slpkg/init.py @@ -262,40 +262,6 @@ class Initialization(object): self.remote(log, ChangeLog_txt, lib, PACKAGES_TXT, CHECKSUMS_MD5, FILELIST_TXT, repo_name) - def studio(self): - """Creating studio local library - """ - ar = "" - arch = self.meta.arch - repo = self.def_repos_dict["studio"] - log = self.log_path + "studio/" - lib = self.lib_path + "studio_repo/" - repo_name = log[:-1].split("/")[-1] - lib_file = "PACKAGES.TXT" - # lst_file = "" - md5_file = "CHECKSUMS.md5" - log_file = "ChangeLog.txt" - if not os.path.exists(log): - os.mkdir(log) - if not os.path.exists(lib): - os.mkdir(lib) - if arch == "x86_64": - ar = "64" - PACKAGES_TXT = "{0}slackware{1}-{2}/{3}".format(repo, ar, slack_ver(), - lib_file) - FILELIST_TXT = "" - CHECKSUMS_MD5 = "{0}slackware{1}-{2}/{3}".format(repo, ar, slack_ver(), - md5_file) - ChangeLog_txt = "{0}slackware{1}-{2}/{3}".format(repo, ar, slack_ver(), - log_file) - if self.check: - return self.checks_logs(log, ChangeLog_txt) - self.down(lib, PACKAGES_TXT, repo_name) - self.down(lib, CHECKSUMS_MD5, repo_name) - self.down(log, ChangeLog_txt, repo_name) - self.remote(log, ChangeLog_txt, lib, PACKAGES_TXT, CHECKSUMS_MD5, - FILELIST_TXT, repo_name) - def slackr(self): """Creating slackers local library """