diff options
| author | Andreas Guldstrand <andreas.guldstrand@gmail.com> | 2016-02-13 20:37:13 +0100 |
|---|---|---|
| committer | Andreas Guldstrand <andreas.guldstrand@gmail.com> | 2016-02-13 20:37:13 +0100 |
| commit | 82bab9715c8018b238f13fa02c27af28ece97035 (patch) | |
| tree | 39cb6d0b99004e02e3862209a11921bc6b33053d /SBO-Lib | |
| parent | bc109c4e73fb98b27b552cac67b438ca0b0f273c (diff) | |
| download | sbotools2-82bab9715c8018b238f13fa02c27af28ece97035.tar.xz | |
git fetch; git reset --hard origin; instead of pulling. This fixes #27
Diffstat (limited to 'SBO-Lib')
| -rw-r--r-- | SBO-Lib/lib/SBO/Lib.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/SBO-Lib/lib/SBO/Lib.pm b/SBO-Lib/lib/SBO/Lib.pm index 066dc12..e50c04c 100644 --- a/SBO-Lib/lib/SBO/Lib.pm +++ b/SBO-Lib/lib/SBO/Lib.pm @@ -299,9 +299,9 @@ sub git_sbo_tree { if (-d "$repo_path/.git" and check_git_remote($repo_path, $url)) { my $cwd = getcwd(); chdir $repo_path; - system(qw/ git reset HEAD --hard /) == 0 or chdir $cwd and return 0; - system(qw/ git fetch /) == 0 or chdir $cwd and return 0; - system(qw/ git pull /) == 0 or chdir $cwd and return 0; + system(qw! git fetch !) == 0 or chdir $cwd and return 0; + system(qw! git reset --hard origin !) == 0 or chdir $cwd and return 0; + unlink "$repo_path/SLACKBUILDS.TXT"; chdir $cwd and return 1; } else { my $cwd = getcwd(); |