Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Fri Apr 15 20:11:12 CEST 2011.
-------- --- aaa_base/aaa_base.changes 2011-03-21 14:05:41.000000000 +0100 +++ aaa_base/aaa_base.changes 2011-04-15 17:45:40.000000000 +0200 @@ -1,0 +2,22 @@ +Fri Apr 15 15:45:12 UTC 2011 - [email protected] + +- Fix for bnc#686186 and change for fate#309226 + +------------------------------------------------------------------- +Tue Apr 5 14:39:56 UTC 2011 - [email protected] + +- boot.cleanup: when cleaning var/run, try to symlink /var/run to /run + +------------------------------------------------------------------- +Wed Mar 30 10:18:36 UTC 2011 - [email protected] + +- mount /run if needed +- /etc/init.d/boot: mount /run as tmpfs if not there yet + +------------------------------------------------------------------- +Mon Mar 21 15:04:08 UTC 2011 - [email protected] + +- call osc ci after pushing changes +- make it work with older git + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.iSPW9q/_old 2011-04-15 20:09:54.000000000 +0200 +++ /var/tmp/diff_new_pack.iSPW9q/_new 2011-04-15 20:09:54.000000000 +0200 @@ -21,7 +21,7 @@ Name: aaa_base Version: 11.5 -Release: 4 +Release: 5 License: GPLv2+ Group: System/Fhs Url: http://gitorious.org/opensuse/aaa_base ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/bash.bashrc new/aaa_base/files/etc/bash.bashrc --- old/aaa_base/files/etc/bash.bashrc 2011-03-21 15:04:56.000000000 +0100 +++ new/aaa_base/files/etc/bash.bashrc 2011-04-15 17:26:52.000000000 +0200 @@ -91,6 +91,10 @@ bash) # Append history list instead of override shopt -s histappend + # All commands of root will have a time stamp + if test "$UID" -eq 0 ; then + HISTTIMEFORMAT=${HISTTIMEFORMAT:-"%F %H:%M:%S "} + fi # Force a reset of the readline library unset TERMCAP # Returns short path (last two directories) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/init.d/boot new/aaa_base/files/etc/init.d/boot --- old/aaa_base/files/etc/init.d/boot 2011-03-21 15:04:56.000000000 +0100 +++ new/aaa_base/files/etc/init.d/boot 2011-04-15 17:26:52.000000000 +0200 @@ -91,6 +91,13 @@ rc_status -v -r fi +DTYPE=$(stat -f -c "%T" /run 2>/dev/null) +if test "$DTYPE" != "tmpfs" ; then + test -d /run || mkdir -m 0755 /run + echo -n "Mounting tmpfs at /run" + mount -n -t tmpfs -o mode=0755,nodev,noexec,nosuid tmpfs /run +fi + cp -axT --remove-destination /lib/udev/devices /dev if test -d /sys/kernel/debug -a "$HAVE_DEBUGFS" = "1" ; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/init.d/boot.cleanup new/aaa_base/files/etc/init.d/boot.cleanup --- old/aaa_base/files/etc/init.d/boot.cleanup 2011-03-21 15:04:56.000000000 +0100 +++ new/aaa_base/files/etc/init.d/boot.cleanup 2011-04-15 17:26:52.000000000 +0200 @@ -56,6 +56,9 @@ test -d /var/run && rec_rem /var/run test -d /var/lock && rec_rem /var/lock fi + if test -d /run -a ! -L /var/run ; then + rmdir /var/run && ln -sf /run /var/run + fi touch /var/run/utmp chmod 664 /var/run/utmp chown root:utmp /var/run/utmp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/init.d/boot.localfs new/aaa_base/files/etc/init.d/boot.localfs --- old/aaa_base/files/etc/init.d/boot.localfs 2011-03-21 15:04:56.000000000 +0100 +++ new/aaa_base/files/etc/init.d/boot.localfs 2011-04-15 17:26:52.000000000 +0200 @@ -265,6 +265,7 @@ mount -oremount /dev mount -oremount /dev/pts mount -oremount /dev/shm + mount -oremount /run # mount the rest mount -av -t $nofs -O no_netdev rc_status -v1 -r diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/profile.d/complete.bash new/aaa_base/files/etc/profile.d/complete.bash --- old/aaa_base/files/etc/profile.d/complete.bash 2011-03-21 15:04:56.000000000 +0100 +++ new/aaa_base/files/etc/profile.d/complete.bash 2011-04-15 17:26:52.000000000 +0200 @@ -82,7 +82,7 @@ case "$(complete -p ${1##*/} 2> /dev/null)" in mkdir) ;; - *) s="-S/" + *) s="-S/" esac case "$c" in @@ -95,7 +95,9 @@ \`*) COMPREPLY=($(compgen -c -P '\`' -S '\`' -- ${c#?})) ;; \$\{*\}) eval COMPREPLY=\(${c}\) ;; \$\{*) COMPREPLY=($(compgen -v -P '${' -S '}' -- ${c#??})) ;; - \$*) COMPREPLY=($(compgen -v -P '$' $s -- ${c#?})) ;; + \$*) COMPREPLY=($(compgen -v -P '$' $s -- ${c#?})) + eval COMPREPLY=\(${COMPREPLY[@]}\) + ((${#COMPREPLY[@]} == 0)) || let isdir++ ;; \~*/*) COMPREPLY=($(compgen -d $s -- "${c}")) ((${#COMPREPLY[@]} == 0)) || let isdir++ ;; \~*) COMPREPLY=($(compgen -u $s -- "${c}")) ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/obs/mkpackage new/aaa_base/obs/mkpackage --- old/aaa_base/obs/mkpackage 2011-03-21 15:04:56.000000000 +0100 +++ new/aaa_base/obs/mkpackage 2011-04-15 17:26:52.000000000 +0200 @@ -11,8 +11,9 @@ echo "ln -s home\:*\:branches\:*/aaa_base ." exit 1 fi -if [ "`git status -s |grep -cv '^??'`" != '0' ]; then +if [ "`git --no-pager diff --name-only|wc -l`" != '0' -o "`git --no-pager diff --name-only --cached|wc -l`" != 0 ]; then echo "*** Error: uncomitted changes" + echo "run 'git add file' to add files, 'git commit -a' to commit changes" exit 1 fi cd "$name" @@ -41,5 +42,8 @@ fi if [ -z "$pushed" ]; then echo "*** Warning: changes not pushed!" + else + cd "$name" + osc ci fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/obs/mktar new/aaa_base/obs/mktar --- old/aaa_base/obs/mktar 2011-03-21 15:04:56.000000000 +0100 +++ new/aaa_base/obs/mktar 2011-04-15 17:26:52.000000000 +0200 @@ -9,8 +9,8 @@ #fullver="$VERSION${scmver:+_}$scmver" pfx="$NAME${fullver:+-$fullver}" fn="$pfx".tar.bz2 -if ! git config --local --get tar.umask >/dev/null 2>&1 ; then - git config --local --add tar.umask 022 +if ! git config --get tar.umask >/dev/null 2>&1 ; then + git config --add tar.umask 022 fi git archive --prefix="$pfx"/ HEAD | bzip2 > $fn echo "version $fullver -> $fn" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
