mirror of
https://git.yoctoproject.org/poky
synced 2026-02-08 18:02:12 +01:00
python-smartpm: 1.4.1 -> 1.5
* Remove the following patches since the are already in the source: smart-config-ignore-all-recommends.patch smart-conflict-provider.patch smart-dflags.patch smart-filename-NAME_MAX.patch smart-flag-exclude-packages.patch smart-flag-ignore-recommends.patch smart-metadata-match.patch smart-multilib-fixes.patch smart-rpm-extra-macros.patch smart-rpm-md-parse.patch smart-rpm-root.patch smart-tmpdir.patch smart-yaml-error.patch * Update the following patches, part of the code are already in the source: smart-attempt.patch smart-improve-error-reporting.patch smart-recommends.patch smartpm-rpm5-nodig.patch * Use github and git repo as the SRC_URI. (From OE-Core rev: 5fc580fc444e45d00de0e50d32b6e6e0b2e6b7ea) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
committed by
Richard Purdie
Richard Purdie
parent
f9ac3f3e20
commit
05b02d27d2
@@ -8,170 +8,8 @@ Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
|
||||
|
||||
diff --git a/smart/commands/channel.py b/smart/commands/channel.py
|
||||
index aa76f91..63fbb35 100644
|
||||
--- a/smart/commands/channel.py
|
||||
+++ b/smart/commands/channel.py
|
||||
@@ -157,7 +157,17 @@ def main(ctrl, opts):
|
||||
opts.show is None and opts.yaml is None):
|
||||
iface.warning(_("Can't edit channels information."))
|
||||
raise Error, _("Configuration is in readonly mode.")
|
||||
-
|
||||
+
|
||||
+ # Argument check
|
||||
+ opts.check_args_of_option("set", -1)
|
||||
+ opts.check_args_of_option("remove", -1)
|
||||
+ opts.check_args_of_option("edit", 0)
|
||||
+ opts.check_args_of_option("enable", -1)
|
||||
+ opts.check_args_of_option("disable", -1)
|
||||
+ opts.ensure_action("channel", ["add", "set", "remove", "remove_all",
|
||||
+ "list", "show", "yaml", "enable", "disable"])
|
||||
+ opts.check_remaining_args()
|
||||
+
|
||||
if opts.add is not None:
|
||||
if not opts.add and opts.args == ["-"]:
|
||||
newchannels = []
|
||||
diff --git a/smart/commands/check.py b/smart/commands/check.py
|
||||
index b08608a..506e852 100644
|
||||
--- a/smart/commands/check.py
|
||||
+++ b/smart/commands/check.py
|
||||
@@ -72,6 +72,9 @@ def parse_options(argv):
|
||||
|
||||
def main(ctrl, opts, reloadchannels=True):
|
||||
|
||||
+ # Argument check
|
||||
+ opts.check_args_of_option("channels", 1)
|
||||
+
|
||||
if sysconf.get("auto-update"):
|
||||
from smart.commands import update
|
||||
updateopts = update.parse_options([])
|
||||
diff --git a/smart/commands/config.py b/smart/commands/config.py
|
||||
index dd50dee..4fe4366 100644
|
||||
--- a/smart/commands/config.py
|
||||
+++ b/smart/commands/config.py
|
||||
@@ -80,6 +80,12 @@ def main(ctrl, opts):
|
||||
globals["false"] = False
|
||||
globals["no"] = False
|
||||
|
||||
+ # Check arguments
|
||||
+ opts.check_args_of_option("set", -1)
|
||||
+ opts.check_args_of_option("remove", -1)
|
||||
+ opts.ensure_action("config", ["set", "show", "yaml", "remove"])
|
||||
+ opts.check_remaining_args()
|
||||
+
|
||||
if opts.set:
|
||||
for opt in opts.set:
|
||||
m = SETRE.match(opt)
|
||||
diff --git a/smart/commands/download.py b/smart/commands/download.py
|
||||
index 6837993..b853c61 100644
|
||||
--- a/smart/commands/download.py
|
||||
+++ b/smart/commands/download.py
|
||||
@@ -81,6 +81,14 @@ def parse_options(argv):
|
||||
|
||||
def main(ctrl, opts):
|
||||
|
||||
+ # Argument check
|
||||
+ opts.check_args_of_option("target", 1)
|
||||
+ opts.check_args_of_option("output", 1)
|
||||
+ opts.check_args_of_option("from_urls", -1)
|
||||
+ opts.check_args_of_option("from_metalink", -1)
|
||||
+ if not opts.args and not opts.from_metalink and not opts.from_urls:
|
||||
+ raise Error, _("no package(s) given")
|
||||
+
|
||||
packages = []
|
||||
if opts.args:
|
||||
if sysconf.get("auto-update"):
|
||||
diff --git a/smart/commands/info.py b/smart/commands/info.py
|
||||
index 12f74f0..59fbe98 100644
|
||||
--- a/smart/commands/info.py
|
||||
+++ b/smart/commands/info.py
|
||||
@@ -58,6 +58,10 @@ def parse_options(argv):
|
||||
|
||||
def main(ctrl, opts, reloadchannels=True):
|
||||
|
||||
+ # Argument check
|
||||
+ if not opts.args:
|
||||
+ raise Error, _("No package(s) given")
|
||||
+
|
||||
if sysconf.get("auto-update"):
|
||||
from smart.commands import update
|
||||
updateopts = update.parse_options([])
|
||||
diff --git a/smart/commands/install.py b/smart/commands/install.py
|
||||
index 8a45954..590222c 100644
|
||||
--- a/smart/commands/install.py
|
||||
+++ b/smart/commands/install.py
|
||||
@@ -76,6 +76,10 @@ def parse_options(argv):
|
||||
|
||||
def main(ctrl, opts):
|
||||
|
||||
+ # Argument check
|
||||
+ if not opts.args:
|
||||
+ raise Error, _("no package(s) given")
|
||||
+
|
||||
if opts.explain:
|
||||
sysconf.set("explain-changesets", True, soft=True)
|
||||
|
||||
diff --git a/smart/commands/reinstall.py b/smart/commands/reinstall.py
|
||||
index e59d896..32da3e6 100644
|
||||
--- a/smart/commands/reinstall.py
|
||||
+++ b/smart/commands/reinstall.py
|
||||
@@ -68,7 +68,11 @@ def parse_options(argv):
|
||||
return opts
|
||||
|
||||
def main(ctrl, opts):
|
||||
-
|
||||
+
|
||||
+ # Argument check
|
||||
+ if not opts.args:
|
||||
+ raise Error, _("no package(s) given")
|
||||
+
|
||||
if opts.explain:
|
||||
sysconf.set("explain-changesets", True, soft=True)
|
||||
|
||||
diff --git a/smart/commands/remove.py b/smart/commands/remove.py
|
||||
index b4823a6..acd3bbd 100644
|
||||
--- a/smart/commands/remove.py
|
||||
+++ b/smart/commands/remove.py
|
||||
@@ -74,6 +74,10 @@ def parse_options(argv):
|
||||
|
||||
def main(ctrl, opts):
|
||||
|
||||
+ # Argument check
|
||||
+ if not opts.args:
|
||||
+ raise Error, _("no package(s) given")
|
||||
+
|
||||
if opts.explain:
|
||||
sysconf.set("explain-changesets", True, soft=True)
|
||||
|
||||
diff --git a/smart/commands/search.py b/smart/commands/search.py
|
||||
index 0d0b573..44806b8 100644
|
||||
--- a/smart/commands/search.py
|
||||
+++ b/smart/commands/search.py
|
||||
@@ -44,6 +44,8 @@ def option_parser():
|
||||
def parse_options(argv):
|
||||
opts = query.parse_options(argv, usage=USAGE, \
|
||||
description=DESCRIPTION, examples=EXAMPLES)
|
||||
+ if not argv:
|
||||
+ raise Error, _("Search expression not specified")
|
||||
opts.name = opts.args
|
||||
opts.summary = opts.args
|
||||
opts.description = opts.args
|
||||
diff --git a/smart/commands/upgrade.py b/smart/commands/upgrade.py
|
||||
index ec86290..7e290d8 100644
|
||||
--- a/smart/commands/upgrade.py
|
||||
+++ b/smart/commands/upgrade.py
|
||||
@@ -91,6 +91,9 @@ def parse_options(argv):
|
||||
|
||||
def main(ctrl, opts):
|
||||
|
||||
+ # Argument check
|
||||
+ opts.check_args_of_option("flag", 1)
|
||||
+
|
||||
if opts.explain:
|
||||
sysconf.set("explain-changesets", True, soft=True)
|
||||
|
||||
diff --git a/smart/util/optparse.py b/smart/util/optparse.py
|
||||
index 4a3d3a8..279b0bf 100644
|
||||
index 6fff1bc..f445a3b 100644
|
||||
--- a/smart/util/optparse.py
|
||||
+++ b/smart/util/optparse.py
|
||||
@@ -70,6 +70,8 @@ import sys, os
|
||||
@@ -183,7 +21,7 @@ index 4a3d3a8..279b0bf 100644
|
||||
|
||||
def _repr(self):
|
||||
return "<%s at 0x%x: %s>" % (self.__class__.__name__, id(self), self)
|
||||
@@ -708,6 +710,12 @@ class Option:
|
||||
@@ -710,6 +712,12 @@ class Option:
|
||||
self.action, self.dest, opt, value, values, parser)
|
||||
|
||||
def take_action(self, action, dest, opt, value, values, parser):
|
||||
@@ -196,7 +34,7 @@ index 4a3d3a8..279b0bf 100644
|
||||
if action == "store":
|
||||
setattr(values, dest, value)
|
||||
elif action == "store_const":
|
||||
@@ -819,6 +827,54 @@ class Values:
|
||||
@@ -821,6 +829,54 @@ class Values:
|
||||
setattr(self, attr, value)
|
||||
return getattr(self, attr)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user