diff --git a/REPOSITORIES.md b/REPOSITORIES.md index f174c58e..7e6dcb4f 100644 --- a/REPOSITORIES.md +++ b/REPOSITORIES.md @@ -30,8 +30,8 @@ MSB (msb) repository has one ChangeLog.txt file for three sub-repositories {1.14 Slonly repository don't support -current for x86 arch. -Alien's ktown (ktown), Alien's multilib (multi), Slacke E17 and E18, slack-n-free, csb, - mles and Alien's restricted repository has no reference dependencies. +Alien's ktown (ktown), Alien's multilib (multi), csb and Alien's restricted repository +has no reference dependencies. IMPORTANT: For Alien's (Eric Hameleers) repositories (alien, multi and ktown) should run '`slpkg upgrade`' instant '`slpkg update`', if you want to spend from -stable in -current or diff --git a/conf/default-repositories b/conf/default-repositories index cf5457cf..155c28c8 100644 --- a/conf/default-repositories +++ b/conf/default-repositories @@ -30,7 +30,7 @@ # # Default repositories names: # sbo, slack, rlw, alien, conrad, slonly, ktown, multi, salix, -# slackl, msb, csb, connos, mles +# slackl, msb, csb, connos # NOTE: Slackware repository (slack) served from file slackware-mirros # ----------------------------------------------------------------------------- # @@ -47,4 +47,3 @@ msb http://slackware.org.uk/msb/ csb http://slackware.uk/csb/ connos https://connochaetos.org/slack-n-free/ - mles http://slackware.uk/microlinux/ diff --git a/conf/repositories.conf b/conf/repositories.conf index 71f3a65c..03f89de1 100644 --- a/conf/repositories.conf +++ b/conf/repositories.conf @@ -26,7 +26,6 @@ # conrad (Conraid's) repository must used from Slackware64 current. # ktown (Alien"s ktown: 4.14.3 and latest) repository. Default ktown{latest}. # msb (Mate: 1.14, 1.16, 1,18, latest) repository. Default msb{1.18} -# mles (Microlinux: desktop, extras, server) repository. Default mles{desktop} # # Slackware ARM users will must use only two repositories at the moment slack and sbo. # @@ -52,4 +51,3 @@ sbo # msb{1.18} # csb # connos -# mles{desktop} diff --git a/man/slpkg.8 b/man/slpkg.8 index 44e3b483..f19e45a3 100644 --- a/man/slpkg.8 +++ b/man/slpkg.8 @@ -334,7 +334,6 @@ For example: MATE Desktop Environment = "msb{1.18}" Cinnamon Desktop Environment = "csb" Connochaetos slack-n-free = "connos" - Microlinux mles = "mles" Default enable repository is "slack" and "sbo". Add or remove default repository in configuration file "/etc/slpkg/repositories.conf". diff --git a/man/slpkg.html b/man/slpkg.html index 9ae27c02..c8319107 100644 --- a/man/slpkg.html +++ b/man/slpkg.html @@ -602,7 +602,6 @@ Slackel.gr = "slackel"
MATE Desktop Environment = "msb{1.18}"
Cinnamon Desktop Environment = "csb"
Connochaetos slack-n-free = "connos"
-Microlinux mles = "mles"

Default enable repository is "slack" and "sbo".
diff --git a/slpkg/__metadata__.py b/slpkg/__metadata__.py index 08e61e92..0430c5bf 100644 --- a/slpkg/__metadata__.py +++ b/slpkg/__metadata__.py @@ -102,7 +102,7 @@ class MetaData: "REPOSITORIES": ["slack", "sbo", "rlw", "alien", "conrad", "slonly", "ktown{latest}", "multi", "salix", "slackl", "msb{1.18}", - "csb", "connos", "mles{desktop}"], + "csb", "connos"], "BUILD_PATH": "/tmp/slpkg/build/", "SBOSRCARCH": "off", "SBOSRCARCH_LINK": "http://slackware.uk/sbosrcarch/by-name/", @@ -130,7 +130,7 @@ class MetaData: default_repositories = ["slack", "sbo", "rlw", "alien", "conrad", "slonly", "ktown", "multi", "salix", - "slackl", "msb", "csb", "connos", "mles"] + "slackl", "msb", "csb", "connos"] # reads values from the configuration file repositories = [] @@ -187,7 +187,6 @@ class MetaData: # Grabs sub repositories ktown_kde_repo = grab_sub_repo(repositories, "ktown") msb_sub_repo = grab_sub_repo(repositories, "msb") - mles_sub_repo = grab_sub_repo(repositories, "mles") # removes no default repositories repositories = list(remove_repositories(repositories, diff --git a/slpkg/binary/repo_init.py b/slpkg/binary/repo_init.py index ce4dae80..a4f7c411 100644 --- a/slpkg/binary/repo_init.py +++ b/slpkg/binary/repo_init.py @@ -134,11 +134,3 @@ class RepoInit(Utils): arch = "64" self.mirror = (f"{self.def_repo_dict['connos']}slack-n-free" f"{arch}-{slack_ver()}/") - - def _init_mles(self): - arch = "32" - if self.meta.arch == "x86_64": - arch = "64" - self.mirror = (f"{self.def_repo_dict['mles']}" - f"{self.meta.mles_sub_repo[1:-1]}-" - f"{slack_ver()}-{arch}bit/") diff --git a/slpkg/checks.py b/slpkg/checks.py index 730f14f2..ba38a7c8 100644 --- a/slpkg/checks.py +++ b/slpkg/checks.py @@ -57,7 +57,6 @@ class Updates: "msb": self._init.msb, "csb": self._init.csb, "connos": self._init.msb, - "mles": self._init.mles } def status_bar(self): diff --git a/slpkg/init.py b/slpkg/init.py index e4e6438d..a27e3b66 100644 --- a/slpkg/init.py +++ b/slpkg/init.py @@ -264,7 +264,7 @@ class Init(Utils): FILELIST_TXT, repo_name) def conrad(self): - """Creating slackers local library + """Creating conrad local library """ repo = self.def_repos_dict["conrad"] log = self.log_path + "conrad/" @@ -293,7 +293,7 @@ class Init(Utils): FILELIST_TXT, repo_name) def slonly(self): - """Creating slackers local library + """Creating slonly local library """ ar = f"{self.slack_ver}-x86" repo = self.def_repos_dict["slonly"] @@ -576,41 +576,6 @@ class Init(Utils): self.remote(log, ChangeLog_txt, lib, PACKAGES_TXT, CHECKSUMS_MD5, FILELIST_TXT, repo_name) - def mles(self): - """Creating Microlinux local library - """ - ar = "32" - repo = self.def_repos_dict["mles"] - log = self.log_path + "mles/" - lib = self.lib_path + "mles_repo/" - repo_name = Init.mles.__name__ - - lib_file = "PACKAGES.TXT" - # lst_file = "" - md5_file = "CHECKSUMS.md5" - log_file = "ChangeLog.txt" - - self.make_dir([log, lib]) - - if self.arch == "x86_64": - ar = "64" - - version = self.meta.mles_sub_repo[1:-1] - PACKAGES_TXT = f"{repo}{version}-{self.slack_ver}-{ar}bit/{lib_file}" - FILELIST_TXT = "" - CHECKSUMS_MD5 = f"{repo}{version}-{self.slack_ver}-{ar}bit/{md5_file}" - ChangeLog_txt = f"{repo}{version}-{self.slack_ver}-{ar}bit/{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 down(self, path, link, repo): """Downloads files """