rpms/akmods/devel akmods,1.7,1.8 akmods.spec,1.9,1.10
Author: hobbes1069
Update of /cvs/free/rpms/akmods/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24700
Modified Files:
akmods akmods.spec
Log Message:
* Tue Nov 24 2011 Richard Shaw <hobbes1069(a)gmail.com> - 0.3.8-3
- Kmod can be newer than akmod due to rebuilds for new kernels (#2063)
Index: akmods
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmods,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- akmods 21 Nov 2011 18:59:40 -0000 1.7
+++ akmods 24 Nov 2011 16:59:46 -0000 1.8
@@ -36,7 +36,7 @@
# global vars
myprog="akmods"
-myver="0.3.7"
+myver="0.3.8"
kmodlogfile=
continue_line=""
tmpdir=
@@ -87,7 +87,7 @@
fi
# global logfile
- echo "$(date +%d\ %b\ %H:%M:%S) akmods: $@" >>
"/var/log/akmods.log"
+ echo "$(date +%d\ %b\ %H:%M:%S) akmods: $@" >>
"/var/cache/akmods/akmods.log"
# the kmods logfile as well, if we work on a kmod
if [[ "${kmodlogfile}" ]]; then
@@ -326,16 +326,15 @@
# Versions are the same. Nothing to do.
return 0
elif [ "$retvalue" == 11 ]; then
- # kmod is newer, this nomally shouldn't happen.
- akmods_echo 1 2 -n "Warning: installed kmod is newer then the akmod"
+ # kmod is newer, nothing to do.
return 0
elif [ "$retvalue" == 12 ]; then
# akmod is newer, need to build kmod.
return 1
else
# Something went wrong
- akmods_echo 2 1 -n "Error: Could not determine if akmod is newer then the
installed kmod"
- akmods_echo 2 1 --failure
+ akmods_echo 1 2 -n "Error: Could not determine if akmod is newer than the
installed kmod"
+ akmods_echo 1 2 --failure
return 0
fi
}
@@ -371,7 +370,7 @@
akmods_echo 1 2 "directories are missing:"
akmods_echo 1 2 "/usr/src/kernels/${this_kernelver}/"
akmods_echo 1 2 -n "/lib/modules/${this_kernelver}/build/"
- akmods_echo 1 2 "Is the correct kernel-devel package installed?"
+ akmods_echo 1 2 -n "Is the correct kernel-devel package installed?"
akmods_echo 1 2 --failure
return 1
fi