Jiří Moskovčák a85baa
commit 9d109b568bbbdee069bb5dfcbca3c259a74e98a8
Jiří Moskovčák a85baa
Author: Denys Vlasenko <vda.linux@googlemail.com>
Jiří Moskovčák a85baa
Date:   Wed Mar 3 11:45:33 2010 +0100
Jiří Moskovčák a85baa
Jiří Moskovčák a85baa
    abrt-debuginfo-install: remove -R2 from yum! it's not "anti-yum-lock" option!
Jiří Moskovčák a85baa
    
Jiří Moskovčák a85baa
    Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Jiří Moskovčák a85baa
Jiří Moskovčák a85baa
diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install
Jiří Moskovčák a85baa
index 3bb9c41..1b6af74 100755
Jiří Moskovčák a85baa
--- a/src/Daemon/abrt-debuginfo-install
Jiří Moskovčák a85baa
+++ b/src/Daemon/abrt-debuginfo-install
Jiří Moskovčák a85baa
@@ -146,11 +148,12 @@ print_package_names() {
Denys Vlasenko 76038b
     # when we look for debuginfo we need only -debuginfo* repos, so we can disable the rest and thus make it faster
Denys Vlasenko 76038b
     # also we want only fedora repositories, because abrt won't work for other packages anyway
Denys Vlasenko 76038b
     # --showduplicates: do not just show the latest package
Denys Vlasenko 76038b
-    # -R2: wait two minutes max (hopefully this prevents infinite hang on yum lock)
Denys Vlasenko 76038b
-    local cmd="yum $yumopts '--disablerepo=*' '--enablerepo=fedora-debuginfo*' '--enablerepo=updates-debuginfo*' --showduplicates -R2 --quiet provides $missing_debuginfo_files"
Jiří Moskovčák a85baa
+    # (tried to use -R2 to abort on stuck yum lock but -R is not about that)
Denys Vlasenko 76038b
+    local cmd="yum $yumopts '--disablerepo=*' '--enablerepo=fedora-debuginfo*' '--enablerepo=updates-debuginfo*' --showduplicates --quiet provides $missing_debuginfo_files"
Denys Vlasenko 76038b
     echo "$cmd" >"yum_provides.$1.OUT"
Jiří Moskovčák a85baa
+    $debug && echo "Running: $cmd" >&2
Denys Vlasenko 76038b
     # eval is needed to strip away ''s; cant remove them above and just use
Jiří Moskovčák a85baa
-    # $cmd, that would perform globbing on '*'
Jiří Moskovčák a85baa
+    # unquoted $cmd, that would perform globbing on '*'
Jiří Moskovčák a85baa
     local yum_provides_OUT="`eval $cmd 2>&1`"
Jiří Moskovčák a85baa
     local err=$?
Jiří Moskovčák a85baa
     printf "%s\nyum exitcode:%s\n" "$yum_provides_OUT" $err >>"yum_provides.$1.OUT"