summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-05-19 10:13:13 +0000
committerColin Guthrie <colin@mageia.org>2013-05-19 10:13:13 +0000
commit947178d6cf84d2da9c1462461ed0ee6dadd1cfe3 (patch)
treecc9b87e3269b21b7b7ced6324106e870870b021a
parentad7285abf5f82a40317be2acd56ad45ae1165f8f (diff)
downloadmgaonline-947178d6cf84d2da9c1462461ed0ee6dadd1cfe3.tar
mgaonline-947178d6cf84d2da9c1462461ed0ee6dadd1cfe3.tar.gz
mgaonline-947178d6cf84d2da9c1462461ed0ee6dadd1cfe3.tar.bz2
mgaonline-947178d6cf84d2da9c1462461ed0ee6dadd1cfe3.tar.xz
mgaonline-947178d6cf84d2da9c1462461ed0ee6dadd1cfe3.zip
Do not pass invalid --nocheck option to urpmi.update
-rw-r--r--NEWS2
-rwxr-xr-xmgaapplet-upgrade-helper2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 5e09b10a..3cba1d06 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- do not pass invalid --nocheck option to urpmi.update
+
Version 2.81 - 15 May 2013, Colin Guthrie
- ensure nonfree/tainted media is kept enabled on distro upgrade
diff --git a/mgaapplet-upgrade-helper b/mgaapplet-upgrade-helper
index 34d598f3..d2db06cd 100755
--- a/mgaapplet-upgrade-helper
+++ b/mgaapplet-upgrade-helper
@@ -336,7 +336,7 @@ sub fork_gurpmi {
}
sub update_media() {
- run_program::run('urpmi.update', if_($root, '--urpmi-root', $root), '-a', '--nocheck');
+ run_program::run('urpmi.update', if_($root, '--urpmi-root', $root), '-a');
}
sub enable_media {