From 42e30498c542c57a1debf45ba918eedac1919c83 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Sun, 9 Apr 2017 21:01:48 +0200 Subject: [PATCH] Added rebuild packages from sbo repo when upgrading #85 --- ChangeLog.txt | 4 +++- man/slpkg.8 | 8 +++++--- slpkg/arguments.py | 8 ++++---- slpkg/main.py | 3 ++- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index cefb0abd..9fe7ad23 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,11 +1,13 @@ -3.2.7 - 06/04/2017 +3.2.7 - 09/04/2017 Updated: - Alien's repositories {alien, ktown, multi} #83 (Thanks to travis-82) - Rworkman's repository {rlw} #83 +- Package security message for network and sbo repository Added: - Sbosrcarch as secondary repository for source files #82 (Thanks to travis-82) +- Rebuild packages from sbo repository when upgrading #85 (Thanks to bhreach) 3.2.6 - 22/02/2017 Updated: diff --git a/man/slpkg.8 b/man/slpkg.8 index df5f58f1..c8abff6e 100644 --- a/man/slpkg.8 +++ b/man/slpkg.8 @@ -39,8 +39,8 @@ Usage: slpkg [COMMANDS|OPTIONS] {repository|package...} [list, build, install, build-install]] [-g [print, edit, reset]] [-l [repository], --index, --installed, --name] - [-c [repository], --upgrade, --skip=[...], --resolve-off, - --checklist] + [-c [repository], --upgrade, --rebuild, --skip=[...], + --resolve-off, --checklist] [-s [repository] [package...], --rebuild, --reinstall, --resolve-off, --download-only, --directory-prefix=[dir], @@ -204,7 +204,7 @@ Additional options: \fB--name\fP : Print package name only. .SS -c, --check, check if your packages is up to date -\fBslpkg\fP \fB-c\fP <\fIrepository\fP> \fB--upgrade\fP \fB--skip=[packages...]\fP, +\fBslpkg\fP \fB-c\fP <\fIrepository\fP> \fB--upgrade\fP \fB--rebuild\fP \fB--skip=[packages...]\fP, \fB--resolve-off\fP, \fB--checklist\fP .PP Check your packages if up to date. Slackware patches repository works independently of the @@ -217,6 +217,8 @@ Additional options: .PP \fB--upgrade\fP : Check and install packages for upgrade. .PP +\fB--rebuild\fP : Rebuild packages from sbo repository. +.PP \fB--resolve-off\fP : Switch off automatic resolve dependencies. .PP \fB--skip=[packages...]\fP : Skip packages from upgrade separate by comma like "slpkg -c sbo --skip=jdk,pep8,pip" (See REGEX). diff --git a/slpkg/arguments.py b/slpkg/arguments.py index 71d83ebd..fbd7a368 100644 --- a/slpkg/arguments.py +++ b/slpkg/arguments.py @@ -110,8 +110,8 @@ Optional arguments: the system. -c | --check, [repository], --upgrade, Check for updated packages from - --skip=[...], --resolve--off the repositories and upgrade or - --checklist install with all dependencies. + --rebuild --skip=[...], the repositories and upgrade or + --resolve-off, --checklist install with all dependencies. -s | --sync, [repository] [package...], Sync packages. Install packages --rebuild, --reinstall, directly from remote repositories @@ -193,8 +193,8 @@ def usage(repo): [list, build, install, build-install]] [-g [print, edit, reset]] [-l [repository], --index, --installed, --name] - [-c [repository], --upgrade, --skip=[...], --resolve-off, - --checklist] + [-c [repository], --upgrade, --rebuild, --skip=[...], + --resolve-off, --checklist] [-s [repository] [package...], --rebuild, --reinstall, --resolve-off, --download-only, --directory-prefix=[dir], diff --git a/slpkg/main.py b/slpkg/main.py index 8d80c4d0..9f11867c 100644 --- a/slpkg/main.py +++ b/slpkg/main.py @@ -292,7 +292,8 @@ class ArgParse(object): "--upgrade", "--skip=", "--resolve-off", - "--checklist" + "--checklist", + "--rebuild" ] flag, skip = self.__pkg_upgrade_flags(flags) if (len(self.args) == 3 and self.args[0] in options and