Merge pull request #396 from jbenet/idcmd-fix

Fix ID command lookups of unconnected nodes
ipfs · Dec 1, 2014 · 2ec2c85 · 2ec2c85
2 parents ff23d2d + b0e915b
commit 2ec2c85
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/core/commands/id.go b/core/commands/id.go
@@ -93,15 +93,13 @@ func printPeer(p peer.Peer) (interface{}, error) {
 	info := new(IdOutput)
 
 	info.ID = p.ID().String()
-	if p.PubKey() == nil {
-		return nil, errors.New(`peer publickey not populated on offline runs,
-please run the daemon to use ipfs id!`)
-	}
-	pkb, err := p.PubKey().Bytes()
-	if err != nil {
-		return nil, err
+	if p.PubKey() != nil {
+		pkb, err := p.PubKey().Bytes()
+		if err != nil {
+			return nil, err
+		}
+		info.PublicKey = base64.StdEncoding.EncodeToString(pkb)
 	}
-	info.PublicKey = base64.StdEncoding.EncodeToString(pkb)
 	for _, a := range p.Addresses() {
 		info.Addresses = append(info.Addresses, a.String())
 	}