--- bash_completion~	2005-12-22 12:58:30.000000000 +0100
+++ bash_completion	2005-12-22 12:58:34.000000000 +0100
@@ -1725,20 +1725,22 @@
 		's|^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.@]\+.*\.rpm$|\1|p' \
 				/var/log/rpmpkgs ) )
 	else
-		nodig=""
-		nosig=""
-		ver=$(rpm --version)
-		ver=${ver##* }
-	  
-		if [[ "$ver" > "4.0.4" ]]; then
-			nodig="--nodigest"
-		fi
-		if [[ "$ver" > "4.0.99" ]]; then
-			nosig="--nosignature"
-		fi
+		if [ -n "${COMP_RPM_DATABASE:-}" ]; then
+			nodig=""
+			nosig=""
+			ver=$(rpm --version)
+			ver=${ver##* }
+		  
+			if [[ "$ver" > "4.0.4" ]]; then
+				nodig="--nodigest"
+			fi
+			if [[ "$ver" > "4.0.99" ]]; then
+				nosig="--nosignature"
+			fi
 
-		COMPREPLY=( $( rpm -qa $nodig $nosig | sed -ne \
-		's|^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.@]\+$|\1|p' ) )
+			COMPREPLY=( $( rpm -qa $nodig $nosig | sed -ne \
+			's|^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.@]\+$|\1|p' ) )
+		fi
 	fi
 }