Merge lp:~seb128/ubuntu-archive-scripts/blocklist into lp:ubuntu-archive-scripts

Proposed by Sebastien Bacher
Status: Merged
Merged at revision: 356
Proposed branch: lp:~seb128/ubuntu-archive-scripts/blocklist
Merge into: lp:ubuntu-archive-scripts
Diff against target: 18 lines (+4/-4)
1 file modified
update-sync-blocklist (+4/-4)
To merge this branch: bzr merge lp:~seb128/ubuntu-archive-scripts/blocklist
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+446079@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'update-sync-blacklist' => 'update-sync-blocklist'
2--- update-sync-blacklist 2012-11-12 00:26:03 +0000
3+++ update-sync-blocklist 2023-07-05 14:38:37 +0000
4@@ -1,10 +1,10 @@
5 #! /bin/sh
6 set -e
7
8-BRANCH="$HOME/sync-blacklist"
9-SOURCE="$BRANCH/sync-blacklist.txt"
10-DESTINATION="$HOME/public_html/sync-blacklist.txt"
11+BRANCH="$HOME/sync-blocklist"
12+SOURCE="$BRANCH/sync-blocklist.txt"
13+DESTINATION="$HOME/public_html/sync-blocklist.txt"
14
15-bzr pull -q --overwrite -d "$BRANCH"
16+git -C "$BRANCH" pull -q
17 cp -a "$SOURCE" "$DESTINATION.new"
18 mv "$DESTINATION.new" "$DESTINATION"

Subscribers

People subscribed via source and target branches