Clarify repo mismatch message (fixes #331)

auto/gui.files.go

@@ -63,7 +63,7 @@ func init() {
 	bs, _ = ioutil.ReadAll(gr)
 	Assets["favicon.png"] = bs
 
-	bs, _ = hex.DecodeString("1f8b080000096e8800ffec5d7d7bdb3692ffdf9f02e1f612a76752ce4bd33d47d673a99d6e7d6d923e7172bd5e9fde3d100989a841822140db5ac7fbd97706e0bb488996edc4dbf68fc424010c0683c1e03783178def1dbe3978f7f38f2f49a82331d91adf73ddad03992c523e0f35d93e78481eef3e7a4afe8b9ec829f946a67342e380481db294f832d6299f665aa6ca232f8420a6942229532c3d6581b7f55e31226744875c1125b3d467502a60045ee7f294a5310bc8740134c9aba377aed20bc188e03e8ba19c0ea9263e244dd9d64c66502d8fe123233f1c1dbc7c7dfc92ccb860de96eb02dbc83d11349eef3b2c76483c776992ec3b6a11fb50773c379f0cbf520896ee3bc745ca814e85437c4195da77309390f4c441928c06932d42c611d394f8214d15d3fb4ea667ee5f9d2a21d43a71d9878c9fee3bffe3be7fe11ec828a19a4f05738c84580ca58e5eeeb360ce6ae5621ab17de794b3b344a6ba96f58c073adc0fd82988c1352f3bd070ae3915aef2a960fb8fbcdd254201537eca13cd655ca3b5948d663a94e9520ec1e313e83501128364ed679a701f2985299bed3b337a8aaf5e02829c6c6101cdb560935288e423b9b8c04e7e0d9dfb1a6ada7e7879391ed95c650596d8544aad744a9391afd4a87cf3221e7bf0c5c9f94055502163da726855432f12688466e71a0b9b1442a63258900bf348484283001872a7526b19ed91af7793f3e779da0c1aedce68c4c5628f38df3171ca34f72979cd32e6ec90f2c30e799182b47788a2b1724195f9cc92b8dc327f32f1efe157658d114de73c76b54cf6c823ef2b1635f27ac8ac1bc958aa8482f65f74f1f28ac542ee905732a63efc3d90b192a0903bc4398031c361a8bd6667c06149a65505056543ed0e70dc04136d5457a713549de55494577fea0c3aa43fb5a41caca4dc995a520e4a294c651ab0d4ca2e9671ab5d42ce654bcc7b64f779b3a76b5f0c19f7abaac313a9388e883dd4291893a7ed0ab8d26e2cdd69064641975599cf46e15c5438cb5aab20344c64515c9609b84a0485bee431e83a73a742fa27051fa0da7624833e16fa512a8eb199a03a55c294fa27f3142d1ed62253607f3edd7efce4d90e79fc7417ff7bf4f0795382290d78a6f6c8935ae30bf93c4acec9d3ea7b21c8c7f0f971f1f9b2dd2e50b3d80b28188e969e0b36036e772b456f34efd16ef5d9683e157c8ef2c7463e5f2fab42c085215e962ff605b9c723b49a34d61d2301e688b2d859c83573cd98d98be519d8998631386356f84f77773b09054b76c536ff3158953e26fe336201a7643ba2e7b954be7ef67572feb024958f0c98241318e8a09413fba53e7ecacc848cbe04ed85a952134a4a6b49602ed268789937f7f6cabce44b68570a76620a532349429095826141a810f28ca0b0a729a3270a675221a178ca92544219014a345230c7c17c7cc67558a768350266f82f47e5e7ba5ca14bd2888a42b097a5428d476610c15c3ab293e9d6d8b4d0cc200034c83b9980b2a704a770fc16d3d37226a6a79862ffa081281e0336a399800913667266f2f13935d39e9d0dc6012f89e02c47a1d1699e86f308e875b30e779a02a47126631ecd8b14b43c0e51a98f13918b6feea3c77f35f31fb1f3b3f3e431cc8e467decf36842cae970ac401ea22016f2004ca07b0ef355b37e3b35649a41ed1f41589034e99c470db9499ea36849266aed28a4537b3443ae6cb899838b02412a93409ec5b55448a7f904fd17a79d0fe43f9f239e418390bfd4a9bc0cb8be1f4f55f27c3c2d650fba04d58f4753f8471b15559c9715442cce1adc187e27254f16bf01323c010c13046f5922b71f02f5ba38e7629184885348f9e48601f6ac15dc7d1601872f82806071981964ba40d6c623a86970d5d83383aa86e69f312b8256f548a2b7e25234fc9407a8b957600f0c8f3eb686410de2d197f3167f45f12b0a860f97cb87143d8076b521d8a7a3c35b918a0a338d4a36883b399b2db1668b5f512260de354df540559941f6b055f15b4ba1abdef12813b5915d4bad52c6231096c1ce23b008d6c0f6d8469b1f2df2b73c551a4cebd90e91b158107007ce62c26724663e538aa68be724e78b9cd134c62928b7de397990000751dc03fa333e3f8ad1289606050857a6b8c18c70a3006c6cdd5ed5d241284c10f3bf9b57dbb45dedbc2e4e3826d7387cd24c314e8933295af19ab1800530433d999412eb278bf357db4e25937721bab5d8de2c35731109a902b795018ea2a7e8e28243154b98c17d00a1140cbe574d1624ca50e4393b3859e7998caf1bb3b326696f3c4a9aaab0966904deb53930cf063c69e0d4ba54f6a5eca7a906af5bc7ae8acc9f7cce2509e0e47c5eb91d4db76cb418adeb8960349df173a7a3af9a1f1aafb597fc7149e3d93c13803740415bfadcd0dc821e16ac2611e330906d0429080f1f56143ab5fcd92a257711f8270ee1010a36af8133b55addf3a1717181450e30611b9fbca343c00fa6afe095516d6922fac3bf3f00dbd86bbde26e0da5463ec8d933b25ad90cb26800079083a0892af04402480143117f69b4b70023f8111af605073ff21c1ab34cbe85ead6c10062a5e41df294f9a6fb3e1213f5f891eaf0f2721df96a0c901ab0b3348f35d5595df44dc8565756ba244db440cd9e68ab78de39856ad4a5d2ec8842c0a494f4526d432c5b3b63db6fe9ee0beb3ad58b905628207f07478627887d3ba8201deb2b74a5616ada978489e17a4ba4691bfad40634221120b2a286a001e273ac9d6bd6d1a1097e05bdcc8ffab9bf7ec3ac33e7ca84c5ad067e6b52aed3b272cc5cab8105468800078a5f7291fdeaf1f8940adea70f83db9fe30357f1795b002fd3546edafe6e663f6747fb3202b7a9ed6020ae085319f3bf1bb8708ddeeeb0669faba97321a76d97e16ff08d8a862f77131d3b3764bfe582299818a838a30bf53a8ba62cbdbc342b0e6a87f414fa66a14da1298f290e916f3e9fc04219b5e5f583f46f415c02a95e515aa6cc1d12962f6416b8e8e30949dbf1823700dde5ccc0f59b91580c0ec715058645ee90bc305cdb92d22baac0c5b8ae76f5e62f30583e7118c1bc0558fa067c5467f233537d40ab87c0bd1685d7721d81cf27ed0cec39f34f585b318fe6b14c19f991a511570a4cbdba7d99db3ab14ab5b9d81b44eeb2e44d3cdca562698ab571f29fb80e37340986b232514c14c9c6732ba4f4a16448328b0a1dbec7925b613e773b390e46b7baa30249ca2330454e4f20b26add80b80080559f8b365c032a36fad5a5215deed1064181ba4b8f31cc9a336f047063de7c0cc487b9f1e51247cd6fc7d207b339baeebf140b04db0f7fbd3bcebb6d5ee1b5e39b8b7c0e89d1d7b10a4c7e71b1f691b7d98c8e6bfacb153f6b3c6510f09fcef2b2b3bc14b17bf18abcd75c5ccfcb500b400d91077fee06b0d1549da8564b0f7e7c7f732df5930ce63d1f464c0bfcc16b0cde564aLine truncated
+	bs, _ = hex.DecodeString("1f8b080000096e8800ffec5d7d7bdb3692ffdf9f02e1f612a76752ce4bd33d47d673a99d6e7d6d923e7172bd5e9fde3d100989a841822140db5ac7fbd97706e0bb488996edc4dbf68fc424010c0683c1e03783178def1dbe3978f7f38f2f49a82331d91adf73ddad03992c523e0f35d93e78481eef3e7a4afe8b9ec829f946a67342e380481db294f832d6299f665aa6ca232f8420a6942229532c3d6581b7f55e31226744875c1125b3d467502a60045ee7f294a5310bc8740134c9aba377aed20bc188e03e8ba19c0ea9263e244dd9d64c66502d8fe123233f1c1dbc7c7dfc92ccb860de96eb02dbc83d11349eef3b2c76483c776992ec3b6a11fb50773c379f0cbf520896ee3bc745ca814e85437c4195da77309390f4c441928c06932d42c611d394f8214d15d3fb4ea667ee5f9d2a21d43a71d9878c9fee3bffe3be7fe11ec828a19a4f05738c84580ca58e5eeeb360ce6ae5621ab17de794b3b344a6ba96f58c073adc0fd82988c1352f3bd070ae3915aef2a960fb8fbcdd254201537eca13cd655ca3b5948d663a94e9520ec1e313e83501128364ed679a701f2985299bed3b337a8aaf5e02829c6c6101cdb560935288e423b9b8c04e7e0d9dfb1a6ada7e7879391ed95c650596d8544aad744a9391afd4a87cf3221e7bf0c5c9f94055502163da726855432f12688466e71a0b9b1442a63258900bf348484283001872a7526b19ed91af7793f3e779da0c1aedce68c4c5628f38df3171ca34f72979cd32e6ec90f2c30e799182b47788a2b1724195f9cc92b8dc327f32f1efe157658d114de73c76b54cf6c823ef2b1635f27ac8ac1bc958aa8482f65f74f1f28ac542ee905732a63efc3d90b192a0903bc4398031c361a8bd6667c06149a65505056543ed0e70dc04136d5457a713549de55494577fea0c3aa43fb5a41caca4dc995a520e4a294c651ab0d4ca2e9671ab5d42ce654bcc7b64f779b3a76b5f0c19f7abaac313a9388e883dd4291893a7ed0ab8d26e2cdd69064641975599cf46e15c5438cb5aab20344c64515c9609b84a0485bee431e83a73a742fa27051fa0da7624833e16fa512a8eb199a03a55c294fa27f3142d1ed62253607f3edd7efce4d90e79fc7417ff7bf4f0795382290d78a6f6c8935ae30bf93c4acec9d3ea7b21c8c7f0f971f1f9b2dd2e50b3d80b28188e969e0b36036e772b456f34efd16ef5d9683e157c8ef2c7463e5f2fab42c085215e962ff605b9c723b49a34d61d2301e688b2d859c83573cd98d98be519d8998631386356f84f77773b09054b76c536ff3158953e26fe336201a7643ba2e7b954be7ef67572feb024958f0c98241318e8a09413fba53e7ecacc848cbe04ed85a952134a4a6b49602ed268789937f7f6cabce44b68570a76620a532349429095826141a810f28ca0b0a729a3270a675221a178ca92544219014a345230c7c17c7cc67558a768350266f82f47e5e7ba5ca14bd2888a42b097a5428d476610c15c3ab293e9d6d8b4d0cc200034c83b9980b2a704a770fc16d3d37226a6a79862ffa081281e0336a399800913667266f2f13935d39e9d0dc6012f89e02c47a1d1699e86f308e875b30e779a02a47126631ecd8b14b43c0e51a98f13918b6feea3c77f35f31fb1f3b3f3e431cc8e467decf36842cae970ac401ea22016f2004ca07b0ef355b37e3b35649a41ed1f41589034e99c470db9499ea36849266aed28a4537b3443ae6cb899838b02412a93409ec5b55448a7f904fd17a79d0fe43f9f239e418390bfd4a9bc0cb8be1f4f55f27c3c2d650fba04d58f4753f8471b15559c9715442cce1adc187e27254f16bf01323c010c13046f5922b71f02f5ba38e7629184885348f9e48601f6ac15dc7d1601872f82806071981964ba40d6c623a86970d5d83383aa86e69f312b8256f548a2b7e25234fc9407a8b957600f0c8f3eb686410de2d197f3167f45f12b0a860f97cb87143d8076b521d8a7a3c35b918a0a338d4a36883b399b2db1668b5f512260de354df540559941f6b055f15b4ba1abdef12813b5915d4bad52c6231096c1ce23b008d6c0f6d8469b1f2df2b73c551a4cebd90e91b158107007ce62c26724663e538aa68be724e78b9cd134c62928b7de397990000751dc03fa333e3f8ad1289606050857a6b8c18c70a3006c6cdd5ed5d241284c10f3bf9b57dbb45dedbc2e4e3826d7387cd24c314e8933295af19ab1800530433d999412eb278bf357db4e25937721bab5d8de2c35731109a902b795018ea2a7e8e28243154b98c17d00a1140cbe574d1624ca50e4393b3859e7998caf1bb3b326696f3c4a9aaab0966904deb53930cf063c69e0d4ba54f6a5eca7a906af5bc7ae8acc9f7cce2509e0e47c5eb91d4db76cb418adeb8960349df173a7a3af9a1f1aafb597fc7149e3d93c13803740415bfadcd0dc821e16ac2611e330906d0429080f1f56143ab5fcd92a257711f8270ee1010a36af8133b55addf3a1717181450e30611b9fbca343c00fa6afe095516d6922fac3bf3f00dbd86bbde26e0da5463ec8d933b25ad90cb26800079083a0892af04402480143117f69b4b70023f8111af605073ff21c1ab34cbe85ead6c10062a5e41df294f9a6fb3e1213f5f891eaf0f2721df96a0c901ab0b3348f35d5595df44dc8565756ba244db440cd9e68ab78de39856ad4a5d2ec8842c0a494f4526d432c5b3b63db6fe9ee0beb3ad58b905628207f07478627887d3ba8201deb2b74a5616ada978489e17a4ba4691bfad40634221120b2a286a001e273ac9d6bd6d1a1097e05bdcc8ffab9bf7ec3ac33e7ca84c5ad067e6b52aed3b272cc5cab8105468800078a5f7291fdeaf1f8940adea70f83db9fe30357f1795b002fd3546edafe6e663f6747fb3202b7a9ed6020ae085319f3bf1bb8708ddeeeb0669faba97321a76d97e16ff08d8a862f77131d3b3764bfe582299818a838a30bf53a8ba62cbdbc342b0e6a87f414fa66a14da1298f290e916f3e9fc04219b5e5f583f46f415c02a95e515aa6cc1d12962f6416b8e8e30949dbf1823700dde5ccc0f59b91580c0ec715058645ee90bc305cdb92d22baac0c5b8ae76f5e62f30583e7118c1bc0558fa067c5467f233537d40ab87c0bd1685d7721d81cf27ed0cec39f34f585b318fe6b14c19f991a511570a4cbdba7d99db3ab14ab5b9d81b44eeb2e44d3cdca562698ab571f29fb80e37340986b232514c14c9c6732ba4f4a16448328b0a1dbec7925b613e773b390e46b7baa30249ca2330454e4f20b26add80b80080559f8b365c032a36fad5a5215deed1064181ba4b8f31cc9a336f047063de7c0cc487b9f1e51247cd6fc7d207b339baeebf140b04db0f7fbd3bcebb6d5ee1b5e39b8b7c0e89d1d7b10a4c7e71b1f691b7d98c8e6bfacb153f6b3c6510f09fcef2b2b3bc14b17bf18abcd75c5ccfcb500b400d91077fee06b0d1549da8564b0f7e7c7f732df5930ce63d1f464c0bfcc16b0cde564aLine truncated
 	gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
 	bs, _ = ioutil.ReadAll(gr)
 	Assets["index.html"] = bs

gui/index.html

@@ -516,7 +516,7 @@ found in the LICENSE file.
                   <p class="help-block">File permission bits are ignored when looking for changes. Use on FAT filesystems.</p>
                 </div>
                 <div class="form-group">
-                  <label for="nodes">Nodes</label>
+                  <label for="nodes">Share With</label>
                   <div class="checkbox" ng-repeat="node in otherNodes()">
                     <label>
                       <input type="checkbox" ng-model="currentRepo.selectedNodes[node.NodeID]"> {{nodeName(node)}}

model/model.go

@@ -279,8 +279,7 @@ func (m *Model) Index(nodeID string, repo string, fs []protocol.FileInfo) {
 	if r, ok := m.repoFiles[repo]; ok {
 		r.Replace(id, files)
 	} else {
-		l.Warnf("Index from %s for unexpected repo %q; verify configuration", nodeID, repo)
-
+		l.Warnf("Unexpected repository ID %q sent from node %q; ensure that the repository exists and that this node is selected under \"Share With\" in the repository configuration.", repo, nodeID)
 	}
 	m.rmut.RUnlock()
 }