diff --git a/translation-update-upstream.changes b/translation-update-upstream.changes index b830f7d..8f64e2c 100644 --- a/translation-update-upstream.changes +++ b/translation-update-upstream.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 18 19:07:52 CEST 2011 - sbrabec@suse.cz + +- Supplementary scripts improvement: + * Fixed partial mandatory update. + ------------------------------------------------------------------- Fri Oct 14 01:58:46 CEST 2011 - sbrabec@suse.cz diff --git a/upstream-collect.sh b/upstream-collect.sh index 3330884..ccb7c00 100644 --- a/upstream-collect.sh +++ b/upstream-collect.sh @@ -145,6 +145,28 @@ if ! $FULL_PROCESS ; then let SNAPSHOT_PART2++ fi SNAPSHOT=$SNAPSHOT_PART1.$SNAPSHOT_PART2 + + for ARCHIVE_ in translation-update-mandatory-*.tar.bz2 ; do + ARCHIVE=$ARCHIVE_ + done + if ! test -f STAMPS/UPDATE_old_mtarball ; then + cd UPDATE + tar -jxf ../$ARCHIVE + # If it is not a full process, increment only release + # SNAPSHOT 20090213 -> 20090213.1, 20090213.1 -> 20090213.2 + cd .. + touch STAMPS/UPDATE_old_mtarball + fi + MSNAPSHOT=${ARCHIVE#translation-update-mandatory-} + MSNAPSHOT=${MSNAPSHOT%.tar.bz2} + SNAPSHOT_PART1=${MSNAPSHOT%.*} + SNAPSHOT_PART2=${MSNAPSHOT#*.} + if test "$SNAPSHOT_PART1" = "$MSNAPSHOT" ; then + SNAPSHOT_PART2=1 + else + let SNAPSHOT_PART2++ + fi + MSNAPSHOT=$SNAPSHOT_PART1.$SNAPSHOT_PART2 fi SERIAL=0 @@ -602,10 +624,10 @@ fi if $COLLECT_UPSTREAM ; then cd $WORK_DIR/UPDATE if test -d po ; then - tar -j -c -f $WORK_DIR/translation-update-upstream-$SNAPSHOT.tar.bz2 po + tar -j -c -f $WORK_DIR/translation-update-upstream-$MSNAPSHOT.tar.bz2 po fi if test -d po-mandatory ; then - tar -j -c -f $WORK_DIR/translation-update-mandatory-$SNAPSHOT.tar.bz2 po-mandatory + tar -j -c -f $WORK_DIR/translation-update-mandatory-$MSNAPSHOT.tar.bz2 po-mandatory fi fi