Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

fix bug in section line parsing of FeatureFile; fixes #6 #9

Merged
merged 2 commits into from

2 participants

@tolot27

Please incorporate this commit. I've already send a patch 8 month ago. Hopefully, pull requests will be considered earlier.

@lstein lstein was assigned
@lstein
Owner

Thank you for the fix, and sorry it took so long to merge.

@lstein lstein closed this
@lstein lstein reopened this
@lstein lstein merged commit 94d6d70 into GMOD:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 8 additions and 2 deletions.
  1. +2 −2 lib/Bio/Graphics/FeatureFile.pm
  2. +6 −0 pull.sh
View
4 lib/Bio/Graphics/FeatureFile.pm
@@ -842,7 +842,7 @@ sub _state_transition {
return 'data' if $line =~ /^reference\s*=/; # feature-file reference sequence directive
return 'config' if $line =~ /^\s*$/; #empty line
- return 'config' if $line =~ m/^\[([^\]]+)\]/; # section beginning
+ return 'config' if $line =~ m/^\[(.+)\]/; # section beginning
return 'config' if $line =~ m/^[\w:\s]+=/
&& $self->{current_config}; # configuration line
return 'config' if $line =~ m/^\s+(.+)/
@@ -870,7 +870,7 @@ sub parse_config_line {
return 1;
}
- elsif (/^\[([^\]]+)\]/) { # beginning of a configuration section
+ elsif (/^\[(.+)\]/) { # beginning of a configuration section
my $label = $1;
my $cc = $label =~ /^(general|default)$/i ? 'general' : $label; # normalize
push @{$self->{types}},$cc unless $cc eq 'general';
View
6 pull.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+git pull
+# Fetches any new changes from the original repository
+git fetch upstream
+# Merges any changes fetched into your working files
+git merge upstream/master
Something went wrong with that request. Please try again.